commit 44c25379773428a5859d34ab25251e77f334f419
author android-build-team Robot <android-build-team-robot@google.com> Sat Mar 10 01:45:29 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Mar 10 01:45:29 2018 +0000
tree 7d687393817804e794328315b40fefe36a0afd31
parent 1075fb66a2815710457e1393e476c2d8ac5466fe
parent 1ec0ed6dc4b55b3b24b74fb783771b2abeff529b

Snap for 4646427 from 1ec0ed6dc4b55b3b24b74fb783771b2abeff529b to studio-3.1-release

Change-Id: I08c4e23063120f8cc4b54ccced59a05b0b962165

firebase-testing/src/com/google/gct/testing/CloudConfigurationChooserDialog.java

diff --git a/firebase-testing/src/com/google/gct/testing/CloudConfigurationChooserDialog.java b/firebase-testing/src/com/google/gct/testing/CloudConfigurationChooserDialog.java
index 13cb1e3..888d950 100644
--- a/firebase-testing/src/com/google/gct/testing/CloudConfigurationChooserDialog.java
+++ b/firebase-testing/src/com/google/gct/testing/CloudConfigurationChooserDialog.java
@@ -168,7 +168,7 @@
     myConfigurationTree.setCellRenderer(new ColoredTreeCellRenderer() {
 
       @Override
-      public void customizeCellRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row,
+      public void customizeCellRenderer(@NotNull JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row,
                                         boolean hasFocus) {
         if (value instanceof DefaultMutableTreeNode) {
           final DefaultMutableTreeNode node = (DefaultMutableTreeNode)value;
@@ -299,7 +299,7 @@
   private JPanel createLeftPanel() {
     myToolbarDecorator = ToolbarDecorator.createDecorator(myConfigurationTree).setAsUsualTopToolbar()
       .setAddAction(myAddAction).setAddActionUpdater(myAddAction).setAddActionName(
-        ExecutionBundle.message("add.new.run.configuration.acrtion.name"))
+        ExecutionBundle.message("add.new.run.configuration.action2.name"))
       .setRemoveAction(myRemoveAction).setRemoveActionUpdater(myRemoveAction).setRemoveActionName(
         ExecutionBundle.message("remove.run.configuration.action.name"))
       .setMoveUpAction(myMoveUpAction).setMoveUpActionUpdater(myMoveUpAction).setMoveUpActionName(
@@ -308,7 +308,7 @@
         ExecutionBundle.message("move.down.action.name"))
       .addExtraAction(myCopyActionButton)
       //.addExtraAction(AnActionButton.fromAction(new MySaveAction()))
-      .setButtonComparator(ExecutionBundle.message("add.new.run.configuration.acrtion.name"),
+      .setButtonComparator(ExecutionBundle.message("add.new.run.configuration.action2.name"),
                            ExecutionBundle.message("remove.run.configuration.action.name"),
                            ExecutionBundle.message("copy.configuration.action.name"),
                            ExecutionBundle.message("action.name.save.configuration"),
@@ -388,6 +388,7 @@
     }
   }
 
+  @Nullable
   public CloudConfigurationImpl getSelectedConfiguration() {
     return selectedConfiguration;
   }