ddmuilib: remove custom portFieldEditor

This was just a buggy implementation of a simple IntegerFieldEditor
with a custom validation range.

Change-Id: I02516de853b060259e7d087ac4964532c6f5ade3

2 files changed, 5 insertions, 76 deletions

diff --git a/ddms/app/src/main/java/com/android/ddms/PrefsDialog.java b/ddms/app/src/main/java/com/android/ddms/PrefsDialog.java
index acadeb8..c39659e 100644
--- a/ddms/app/src/main/java/com/android/ddms/PrefsDialog.java
+++ b/ddms/app/src/main/java/com/android/ddms/PrefsDialog.java
@@ -21,7 +21,6 @@ import com.android.ddmlib.DdmPreferences;
 import com.android.ddmlib.Log;
 import com.android.ddmlib.Log.LogLevel;
 import com.android.ddmuilib.DdmUiPreferences;
-import com.android.ddmuilib.PortFieldEditor;
 import com.android.ddmuilib.logcat.LogCatMessageList;
 import com.android.ddmuilib.logcat.LogCatPanel;
 import com.android.sdkstats.DdmsPreferenceStore;
@@ -353,12 +352,14 @@ public final class PrefsDialog {
         protected void createFieldEditors() {
             IntegerFieldEditor ife;
 
-            ife = new PortFieldEditor(PREFS_DEBUG_PORT_BASE,
+            ife = new IntegerFieldEditor(PREFS_DEBUG_PORT_BASE,
                 "Starting value for local port:", getFieldEditorParent());
+            ife.setValidRange(1024, 32767);
             addField(ife);
 
-            ife = new PortFieldEditor(PREFS_SELECTED_DEBUG_PORT,
+            ife = new IntegerFieldEditor(PREFS_SELECTED_DEBUG_PORT,
                 "Port of Selected VM:", getFieldEditorParent());
+            ife.setValidRange(1024, 32767);
             addField(ife);
 
             mUseAdbHost = new BooleanFieldEditor(PREFS_USE_ADBHOST,
@@ -378,6 +379,7 @@ public final class PrefsDialog {
             if (event.getSource().equals(mUseAdbHost)) {
                 mAdbHostValue.setEnabled(mUseAdbHost.getBooleanValue(), getFieldEditorParent());
             }
+            super.propertyChange(event);
         }
     }
 
diff --git a/ddms/ddmuilib/src/main/java/com/android/ddmuilib/PortFieldEditor.java b/ddms/ddmuilib/src/main/java/com/android/ddmuilib/PortFieldEditor.java
deleted file mode 100644
index 533372e..0000000
--- a/ddms/ddmuilib/src/main/java/com/android/ddmuilib/PortFieldEditor.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.ddmuilib;
-
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Edit an integer field, validating it as a port number.
- */
-public class PortFieldEditor extends IntegerFieldEditor {
-
-    public boolean mRecursiveCheck = false;
-
-    public PortFieldEditor(String name, String label, Composite parent) {
-        super(name, label, parent);
-        setValidateStrategy(VALIDATE_ON_KEY_STROKE);
-    }
-
-    /*
-     * Get the current value of the field, as an integer.
-     */
-    public int getCurrentValue() {
-        int val;
-        try {
-            val = Integer.parseInt(getStringValue());
-        }
-        catch (NumberFormatException nfe) {
-            val = -1;
-        }
-        return val;
-    }
-
-    /*
-     * Check the validity of the field.
-     */
-    @Override
-    protected boolean checkState() {
-        if (super.checkState() == false) {
-            return false;
-        }
-        //Log.i("ddms", "check state " + getStringValue());
-        boolean err = false;
-        int val = getCurrentValue();
-        if (val < 1024 || val > 32767) {
-            setErrorMessage("Port must be between 1024 and 32767");
-            err = true;
-        } else {
-            setErrorMessage(null);
-            err = false;
-        }
-        showErrorMessage();
-        return !err;
-    }
-
-    protected void updateCheckState(PortFieldEditor pfe) {
-        pfe.refreshValidState();
-    }
-}