Merge remote branch 'cros/upstream' into tempbranch3

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

 package autotest.afe;
 
 import autotest.common.Utils;
 import autotest.common.table.ArrayDataSource;
-import autotest.common.table.SelectionManager;
-import autotest.common.table.TableDecorator;
 import autotest.common.table.DataSource.DefaultDataCallback;
 import autotest.common.table.DataSource.Query;
 import autotest.common.table.DynamicTable.DynamicTableListener;
+import autotest.common.table.SelectionManager;
 import autotest.common.table.SelectionManager.SelectionListener;
+import autotest.common.table.TableDecorator;
 import autotest.common.ui.NotifyManager;
 import autotest.common.ui.SimplifiedList;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONNumber;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
@@ skipping 98 matching lines @@
                 }
                 selectionRefresh();
             }
         });
 
         selectedTable.addListener(new DynamicTableListener() {
             public void onRowClicked(int rowIndex, JSONObject row, boolean isRightClick) {
                 if (isMetaEntry(row) || isOneTimeHost(row)) {
                     deselectRow(row);
                     selectionRefresh();
+                } else {
+                    availableSelection.deselectObject(row);
                 }
-                else
-                    availableSelection.deselectObject(row);
             }
 
             public void onTableRefreshed() {}
         });
     }
 
     public void bindDisplay(Display display) {
         this.display = display;
         display.getAddByHostnameButton().addClickHandler(this);
         display.getAddByLabelButton().addClickHandler(this);
@@ skipping 120 matching lines @@
 
     private void deselectAll() {
         availableSelection.deselectAll();
         // get rid of leftover meta-host entries
         selectedHostData.clear();
         selectionRefresh();
     }
 
     private void populateLabels(SimplifiedList list) {
         String[] labelNames = AfeUtils.getLabelStrings();
-        for(int i = 0; i < labelNames.length; i++) {
-            list.addItem(labelNames[i], "");
+        for (String labelName : labelNames) {
+            list.addItem(labelName, "");
         }
     }
 
     private String getHostname(JSONObject row) {
         return row.get("hostname").isString().stringValue();
     }
 
     private boolean isMetaEntry(JSONObject row) {
         return getHostname(row).startsWith(META_PREFIX);
     }
@@ skipping 72 matching lines @@
     public void refresh() {
         availableTable.refresh();
         selectionRefresh();
     }
 
     public void setEnabled(boolean enabled) {
         this.enabled = enabled;
         display.setVisible(enabled);
     }
 }