Fix bug: web app name incorrect in prompt message (#2217)

microsoft · Oct 18, 2018 · 3af634d · 3af634d
1 parent 568e555
commit 3af634d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppNode.java b/...-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppNode.java
@@ -26,7 +26,6 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import com.microsoft.azuretools.azurecommons.helpers.AzureCmdException;
 import com.microsoft.azuretools.telemetry.AppInsightsConstants;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import com.microsoft.tooling.msservices.serviceexplorer.NodeActionEvent;
@@ -36,7 +35,7 @@
 import com.microsoft.tooling.msservices.serviceexplorer.azure.webapp.base.WebAppBaseState;
 
 public class WebAppNode extends WebAppBaseNode implements WebAppNodeView {
-    private static final String DELETE_WEBAPP_PROMPT_MESSAGE = "This operation will delete Web App %s.\n"
+    private static final String DELETE_WEBAPP_PROMPT_MESSAGE = "This operation will delete the Web App: %s.\n"
         + "Are you sure you want to continue?";
     private static final String DELETE_WEBAPP_PROGRESS_MESSAGE = "Deleting Web App";
     private static final String LABEL = "WebApp";
@@ -57,6 +56,7 @@ public WebAppNode(WebAppModule parent, String subscriptionId, String webAppId, S
         this.propertyMap = propertyMap;
         webAppNodePresenter = new WebAppNodePresenter<>();
         webAppNodePresenter.onAttachView(WebAppNode.this);
+        loadActions();
     }
 
     @Override
@@ -142,12 +142,12 @@ private class DeleteWebAppAction extends AzureNodeActionPromptListener {
         }
 
         @Override
-        protected void azureNodeAction(NodeActionEvent e) throws AzureCmdException {
+        protected void azureNodeAction(NodeActionEvent e) {
             getParent().removeNode(getSubscriptionId(), getWebAppId(), WebAppNode.this);
         }
 
         @Override
-        protected void onSubscriptionsChanged(NodeActionEvent e) throws AzureCmdException {
+        protected void onSubscriptionsChanged(NodeActionEvent e) {
         }
     }
 }
diff --git a/...rc/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/base/WebAppBaseNode.java b/...rc/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/base/WebAppBaseNode.java
@@ -62,7 +62,6 @@ public WebAppBaseNode(final String id, final String name, final String label, fi
         this.subscriptionId = subscriptionId;
         this.os = StringUtils.capitalize(os.toLowerCase());
         this.hostName = hostName;
-        loadActions();
     }
 
     protected static String getIcon(final String os, final String label, final WebAppBaseState state) {

diff --git a/...ft/tooling/msservices/serviceexplorer/azure/webapp/deploymentslot/DeploymentSlotNode.java b/...ft/tooling/msservices/serviceexplorer/azure/webapp/deploymentslot/DeploymentSlotNode.java
@@ -47,6 +47,7 @@ public DeploymentSlotNode(final String slotId, final String webAppId, final Depl
         this.slotName = name;
         this.presenter = new DeploymentSlotNodePresenter();
         this.presenter.onAttachView(this);
+        loadActions();
     }
 
     @Override