# HG changeset patch
# User Jon VanAlten <jon.vanalten@redhat.com>
# Date 1385427946 25200
# Node ID cc26300bfea8be931207505c1f8b8dbd1bb23651
# Parent  f2ba5c34024d91ba14d16480599baf7c409f5260
Fix eclipse build broken by StorageCredentials patch
reviewed-by: omajid
review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-November/008955.html

diff -r f2ba5c34024d -r cc26300bfea8 eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/jobs/ConnectDbJob.java
--- a/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/jobs/ConnectDbJob.java	Mon Nov 25 11:04:57 2013 -0700
+++ b/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/jobs/ConnectDbJob.java	Mon Nov 25 18:05:46 2013 -0700
@@ -78,18 +78,9 @@
      * Establish a DB connection.
      */
     private void connectToBackEnd() throws ConnectionException {
-        char[] password = null;
-        try {
-            DbServiceFactory dbServiceFactory = new DbServiceFactory();
-            password = configuration.getPassword();
-            DbService dbService = dbServiceFactory.createDbService(configuration.getUserName(),
-                    password, configuration.getConnectionUrl());
-            dbService.connect();
-        } finally {
-            if (password != null) {
-                Arrays.fill(password, '\0');
-            }
-        }
+        DbServiceFactory dbServiceFactory = new DbServiceFactory();
+        DbService dbService = dbServiceFactory.createDbService(configuration.getConnectionUrl());
+        dbService.connect();
     }
 }
 
diff -r f2ba5c34024d -r cc26300bfea8 eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/preferences/MainPreferencePage.java
--- a/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/preferences/MainPreferencePage.java	Mon Nov 25 11:04:57 2013 -0700
+++ b/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/preferences/MainPreferencePage.java	Mon Nov 25 18:05:46 2013 -0700
@@ -54,6 +54,7 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
+import com.redhat.thermostat.client.ui.ClientPreferencesModel;
 import com.redhat.thermostat.common.config.ClientPreferences;
 import com.redhat.thermostat.eclipse.LoggerFacility;
 import com.redhat.thermostat.eclipse.ThermostatConstants;
@@ -74,7 +75,7 @@
     private StringFieldEditor usernameEditor;
     private StringFieldEditor passwordEditor;
     private BooleanFieldEditor saveEntitlementsEditor;
-    private ClientPreferences clientPrefs;
+    private ClientPreferencesModel clientPrefs;
     
     /**
      * Default no-arg constructor.
@@ -176,7 +177,7 @@
         addField(passwordEditor);
         addField(saveEntitlementsEditor);
         updateMargins(generalGroup);
-        this.clientPrefs = new ClientPreferences(Activator.getDefault().getKeyring(), Activator.getDefault().getCommonPaths());
+        this.clientPrefs = new ClientPreferencesModel(Activator.getDefault().getKeyring(), new ClientPreferences(Activator.getDefault().getCommonPaths()));
         synchronizeValues();
     }
     
diff -r f2ba5c34024d -r cc26300bfea8 eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/HostsVmsTreeViewPart.java
--- a/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/HostsVmsTreeViewPart.java	Mon Nov 25 11:04:57 2013 -0700
+++ b/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/HostsVmsTreeViewPart.java	Mon Nov 25 18:05:46 2013 -0700
@@ -96,8 +96,7 @@
     private Timer timer;
 
     public HostsVmsTreeViewPart() {
-        ClientPreferences clientPrefs = new ClientPreferences(Activator.getDefault().getKeyring(),
-                                                              Activator.getDefault().getCommonPaths());
+        ClientPreferences clientPrefs = new ClientPreferences(Activator.getDefault().getCommonPaths());
         Job connectJob = new ConnectDbJob(
                 "Connecting to Thermostat storage...", clientPrefs);
         connectJob.setSystem(true);