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

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

 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;
 import autotest.common.SimpleCallback;
 import autotest.common.StaticDataRepository;
 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;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
 import com.google.gwt.json.client.JSONValue;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.ListBox;
 
@@ skipping 30 matching lines @@
         }
         return result.toString();
     }
 
     public static String[] getLabelStrings() {
         return getFilteredLabelStrings(false, false);
     }
 
     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++) {
             JSONObject label = labels.get(i).isObject();
             String name = label.get("name").isString().stringValue();
             boolean labelIsPlatform = label.get("platform").isBoolean().booleanValue();
             JSONObject atomicGroup = label.get("atomic_group").isObject();
             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) {
                     name += PLATFORM_SUFFIX;
                 }
                 result.add(name);
             }
         }
         return result.toArray(new String[result.size()]);
     }
@@ skipping 226 matching lines @@
         return Utils.jsonToString(job.get("id")) + "-" + Utils.jsonToString(job.get("owner"));
     }
 
     public static void populateRadioChooser(RadioChooser chooser, String name) {
         JSONArray options = staticData.getData(name + "_options").isArray();
         for (JSONString jsonOption : new JSONArrayList<JSONString>(options)) {
             chooser.addChoice(Utils.jsonToString(jsonOption));
         }
     }
 
-    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++) {
             if (box.getItemText(i).equals(item)) {
                 box.setSelectedIndex(i);
                 break;
             }
         }
     }
 
@@ skipping 24 matching lines @@
                                                   String targetFieldName) {
         JSONValue dateValue = row.get(sourceFieldName);
         String date = "";
         if (dateValue.isNull() == null) {
             date = dateValue.isString().stringValue();
             date = date.substring(0, date.length() - 3);
         }
         row.put(targetFieldName, new JSONString(date));
     }
 }