Allow the user to set the ADBHOST variable.

With those changes the ADBHOST variable can be
directly set in the Preferences of DDMS and Eclipse,
so that the user can reset adb from inside those
two programs.

Change-Id: I94b24744e8daa3b3b2fe5a3db39203b39cb093ac

3 files changed, 39 insertions, 0 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java
index ef7628d4d..182f91d2e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java
@@ -212,6 +212,12 @@ public final class DdmsPlugin extends AbstractUIPlugin implements IDeviceChangeL
                 } else if (PreferenceInitializer.ATTR_TIME_OUT.equals(property)) {
                     DdmPreferences.setTimeOut(
                             eclipseStore.getInt(PreferenceInitializer.ATTR_TIME_OUT));
+                } else if (PreferenceInitializer.ATTR_USE_ADBHOST.equals(property)) {
+                    DdmPreferences.setUseAdbHost(
+                            eclipseStore.getBoolean(PreferenceInitializer.ATTR_USE_ADBHOST));
+                } else if (PreferenceInitializer.ATTR_ADBHOST_VALUE.equals(property)) {
+                    DdmPreferences.setAdbHostValue(
+                            eclipseStore.getString(PreferenceInitializer.ATTR_ADBHOST_VALUE));
                 }
             }
         });
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferenceInitializer.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferenceInitializer.java
index 95571fc96..4e4736584 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferenceInitializer.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferenceInitializer.java
@@ -68,6 +68,12 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
     public final static String ATTR_LOGCAT_GOTO_PROBLEM =
         DdmsPlugin.PLUGIN_ID + ".logcatGoToProblem"; //$NON-NLS-1$
 
+    public final static String ATTR_USE_ADBHOST =
+        DdmsPlugin.PLUGIN_ID + ".useAdbHost"; //$NON-NLS-1$
+
+    public final static String ATTR_ADBHOST_VALUE =
+        DdmsPlugin.PLUGIN_ID + ".adbHostValue"; //$NON-NLS-1$
+
     /*
      * (non-Javadoc)
      *
@@ -101,6 +107,8 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
         store.setDefault(ATTR_TIME_OUT, DdmPreferences.DEFAULT_TIMEOUT);
 
         store.setDefault(ATTR_LOGCAT_GOTO_PROBLEM, LogCatView.CHOICE_ERROR_LINE);
+        store.setDefault(ATTR_USE_ADBHOST, DdmPreferences.DEFAULT_USE_ADBHOST);
+        store.setDefault(ATTR_ADBHOST_VALUE, DdmPreferences.DEFAULT_ADBHOST_VALUE);
     }
 
     /**
@@ -116,5 +124,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
         DdmPreferences.setInitialHeapUpdate(store.getBoolean(ATTR_DEFAULT_HEAP_UPDATE));
         DdmUiPreferences.setThreadRefreshInterval(store.getInt(ATTR_THREAD_INTERVAL));
         DdmPreferences.setTimeOut(store.getInt(ATTR_TIME_OUT));
+        DdmPreferences.setUseAdbHost(store.getBoolean(ATTR_USE_ADBHOST));
+        DdmPreferences.setAdbHostValue(store.getString(ATTR_ADBHOST_VALUE));
     }
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferencePage.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferencePage.java
index fb852f5bd..47445f8a3 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferencePage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferencePage.java
@@ -26,12 +26,17 @@ import org.eclipse.jface.preference.ComboFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IntegerFieldEditor;
 import org.eclipse.jface.preference.RadioGroupFieldEditor;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
 public class PreferencePage extends FieldEditorPreferencePage implements
         IWorkbenchPreferencePage {
 
+    private BooleanFieldEditor mUseAdbHost;
+    private StringFieldEditor mAdbHostValue;
+
     public PreferencePage() {
         super(GRID);
         setPreferenceStore(DdmsPlugin.getDefault().getPreferenceStore());
@@ -87,8 +92,26 @@ public class PreferencePage extends FieldEditorPreferencePage implements
                     },
                 getFieldEditorParent(), true);
         addField(rgfe);
+
+        mUseAdbHost = new BooleanFieldEditor(PreferenceInitializer.ATTR_USE_ADBHOST,
+                "Use ADBHOST", getFieldEditorParent());
+        addField(mUseAdbHost);
+
+        mAdbHostValue = new StringFieldEditor(PreferenceInitializer.ATTR_ADBHOST_VALUE,
+                "ADBHOST value:", getFieldEditorParent());
+        mAdbHostValue.setEnabled(getPreferenceStore()
+                .getBoolean(PreferenceInitializer.ATTR_USE_ADBHOST), getFieldEditorParent());
+        addField(mAdbHostValue);
     }
 
     public void init(IWorkbench workbench) {
     }
+
+    @Override
+    public void propertyChange(PropertyChangeEvent event) {
+        // TODO Auto-generated method stub
+        if (event.getSource().equals(mUseAdbHost)) {
+            mAdbHostValue.setEnabled(mUseAdbHost.getBooleanValue(), getFieldEditorParent());
+        }
+    }
 }