Revert "Merge remote branch 'cros/upstream' into tempbranch2"

frontend/client/src/autotest/afe/AfeUtils.java

Index: frontend/client/src/autotest/afe/AfeUtils.java
diff --git a/frontend/client/src/autotest/afe/AfeUtils.java b/frontend/client/src/autotest/afe/AfeUtils.java
index f435a0a1fe5aba527f4878f1c0c996d1a001dc92..3445b3cc835f5ed41d4071612e5f6ba8b9fc09a9 100644
--- a/frontend/client/src/autotest/afe/AfeUtils.java
+++ b/frontend/client/src/autotest/afe/AfeUtils.java
@@ -1,6 +1,6 @@
 package autotest.afe;
 
-import autotest.afe.create.CreateJobViewPresenter.JobCreateListener;
+import autotest.afe.CreateJobView.JobCreateListener;
 import autotest.common.JSONArrayList;
 import autotest.common.JsonRpcCallback;
 import autotest.common.JsonRpcProxy;
@@ -10,7 +10,6 @@ import autotest.common.Utils;
 import autotest.common.table.JSONObjectSet;
 import autotest.common.ui.NotifyManager;
 import autotest.common.ui.RadioChooser;
-import autotest.common.ui.SimplifiedList;
 
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONBoolean;
@@ -61,7 +60,7 @@ public class AfeUtils {
 
     protected static String[] getFilteredLabelStrings(boolean onlyPlatforms,
                                                       boolean onlyNonPlatforms) {
-        assert !(onlyPlatforms && onlyNonPlatforms);
+        assert( !(onlyPlatforms && onlyNonPlatforms));
         JSONArray labels = staticData.getData("labels").isArray();
         List<String> result = new ArrayList<String>();
         for (int i = 0; i < labels.size(); i++) {
@@ -72,8 +71,8 @@ public class AfeUtils {
             if (atomicGroup != null) {
                 name += ATOMIC_GROUP_SUFFIX;
             }
-            if (onlyPlatforms && labelIsPlatform ||
-                onlyNonPlatforms && !labelIsPlatform) {
+            if ((onlyPlatforms && labelIsPlatform) ||
+                (onlyNonPlatforms && !labelIsPlatform)) {
                     result.add(name);
             } else if (!onlyPlatforms && !onlyNonPlatforms) {
                 if (labelIsPlatform) {
@@ -320,21 +319,13 @@ public class AfeUtils {
         }
     }
 
-    public static void populateListBox(ListBox box, String staticDataKey) {
+    public static void popualateListBox(ListBox box, String staticDataKey) {
         JSONArray options = staticData.getData(staticDataKey).isArray();
         for (JSONString jsonOption : new JSONArrayList<JSONString>(options)) {
             box.addItem(Utils.jsonToString(jsonOption));
         }
     }
 
-    public static void populateListBox(SimplifiedList box, String staticDataKey) {
-        JSONArray options = staticData.getData(staticDataKey).isArray();
-        for (JSONString jsonOption : new JSONArrayList<JSONString>(options)) {
-            String option = Utils.jsonToString(jsonOption);
-            box.addItem(option, option);
-        }
-    }
-
     public static void setSelectedItem(ListBox box, String item) {
         box.setSelectedIndex(0);
         for (int i = 0; i < box.getItemCount(); i++) {