Fix fir issue microsoft#82.

avranju · Jan 14, 2015 · 4885e87 · 4885e87
1 parent 488372d
commit 4885e87
Show file tree

Hide file tree

Showing 36 changed files with 40 additions and 6 deletions.
diff --git a/.idea/libraries/azure_sdk.xml b/.idea/libraries/azure_sdk.xml
diff --git a/lib/com.microsoftopentechnologies.windowsazure.tools.sdk/azure-core-0.7.0-sources.jar b/lib/com.microsoftopentechnologies.windowsazure.tools.sdk/azure-core-0.7.0-sources.jar
diff --git a/lib/com.microsoftopentechnologies.windowsazure.tools.sdk/azure-core-0.7.0.jar b/lib/com.microsoftopentechnologies.windowsazure.tools.sdk/azure-core-0.7.0.jar
diff --git a/lib/com.microsoftopentechnologies.windowsazure.tools.sdk/dependencies/activation-1.1.jar b/lib/com.microsoftopentechnologies.windowsazure.tools.sdk/dependencies/activation-1.1.jar
diff --git a/...ftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-0.7.0-sources.jar b/...ftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-0.7.0-sources.jar
diff --git a/....microsoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-0.7.0.jar b/....microsoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-0.7.0.jar
diff --git a/...chnologies.windowsazure.tools.sdk/dependencies/azure-management-compute-0.7.0-sources.jar b/...chnologies.windowsazure.tools.sdk/dependencies/azure-management-compute-0.7.0-sources.jar
diff --git a/...ftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-compute-0.7.0.jar b/...ftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-compute-0.7.0.jar
diff --git a/...technologies.windowsazure.tools.sdk/dependencies/azure-management-media-0.7.0-sources.jar b/...technologies.windowsazure.tools.sdk/dependencies/azure-management-media-0.7.0-sources.jar
diff --git a/...softopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-media-0.7.0.jar b/...softopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-media-0.7.0.jar
diff --git a/...chnologies.windowsazure.tools.sdk/dependencies/azure-management-network-0.7.0-sources.jar b/...chnologies.windowsazure.tools.sdk/dependencies/azure-management-network-0.7.0-sources.jar
diff --git a/...ftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-network-0.7.0.jar b/...ftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-network-0.7.0.jar
diff --git a/...nologies.windowsazure.tools.sdk/dependencies/azure-management-scheduler-0.7.0-sources.jar b/...nologies.windowsazure.tools.sdk/dependencies/azure-management-scheduler-0.7.0-sources.jar
diff --git a/...opentechnologies.windowsazure.tools.sdk/dependencies/azure-management-scheduler-0.7.0.jar b/...opentechnologies.windowsazure.tools.sdk/dependencies/azure-management-scheduler-0.7.0.jar
diff --git a/...entechnologies.windowsazure.tools.sdk/dependencies/azure-management-sql-0.7.0-sources.jar b/...entechnologies.windowsazure.tools.sdk/dependencies/azure-management-sql-0.7.0-sources.jar
diff --git a/...rosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-sql-0.7.0.jar b/...rosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-sql-0.7.0.jar
diff --git a/...chnologies.windowsazure.tools.sdk/dependencies/azure-management-storage-0.7.0-sources.jar b/...chnologies.windowsazure.tools.sdk/dependencies/azure-management-storage-0.7.0-sources.jar
diff --git a/...ftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-storage-0.7.0.jar b/...ftopentechnologies.windowsazure.tools.sdk/dependencies/azure-management-storage-0.7.0.jar
diff --git a/...hnologies.windowsazure.tools.sdk/dependencies/azure-management-websites-0.7.0-sources.jar b/...hnologies.windowsazure.tools.sdk/dependencies/azure-management-websites-0.7.0-sources.jar
diff --git a/...topentechnologies.windowsazure.tools.sdk/dependencies/azure-management-websites-0.7.0.jar b/...topentechnologies.windowsazure.tools.sdk/dependencies/azure-management-websites-0.7.0.jar
diff --git a/lib/com.microsoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-media-0.6.0.jar b/lib/com.microsoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-media-0.6.0.jar
diff --git a/...crosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-media-0.7.0-sources.jar b/...crosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-media-0.7.0-sources.jar
diff --git a/lib/com.microsoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-media-0.7.0.jar b/lib/com.microsoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-media-0.7.0.jar
diff --git a/...ftopentechnologies.windowsazure.tools.sdk/dependencies/azure-servicebus-0.7.0-sources.jar b/...ftopentechnologies.windowsazure.tools.sdk/dependencies/azure-servicebus-0.7.0-sources.jar
diff --git a/....microsoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-servicebus-0.7.0.jar b/....microsoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-servicebus-0.7.0.jar
diff --git a/...rosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-serviceruntime-0.6.0.jar b/...rosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-serviceruntime-0.6.0.jar
diff --git a/...entechnologies.windowsazure.tools.sdk/dependencies/azure-serviceruntime-0.7.0-sources.jar b/...entechnologies.windowsazure.tools.sdk/dependencies/azure-serviceruntime-0.7.0-sources.jar
diff --git a/...rosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-serviceruntime-0.7.0.jar b/...rosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-serviceruntime-0.7.0.jar
diff --git a/...icrosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-tracing-util-0.6.0.jar b/...icrosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-tracing-util-0.6.0.jar
diff --git a/...opentechnologies.windowsazure.tools.sdk/dependencies/azure-tracing-util-0.7.0-sources.jar b/...opentechnologies.windowsazure.tools.sdk/dependencies/azure-tracing-util-0.7.0-sources.jar
diff --git a/...icrosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-tracing-util-0.7.0.jar b/...icrosoftopentechnologies.windowsazure.tools.sdk/dependencies/azure-tracing-util-0.7.0.jar
diff --git a/...m.microsoftopentechnologies.windowsazure.tools.sdk/dependencies/commons-logging-1.1.3.jar b/...m.microsoftopentechnologies.windowsazure.tools.sdk/dependencies/commons-logging-1.1.3.jar
diff --git a/...icrosoftopentechnologies.windowsazure.tools.sdk/dependencies/httpclient-4.3.1-sources.jar b/...icrosoftopentechnologies.windowsazure.tools.sdk/dependencies/httpclient-4.3.1-sources.jar
diff --git a/msopentech-tools-for-intellij.iml b/msopentech-tools-for-intellij.iml
@@ -12,10 +12,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="AzureCommons" level="project" />
     <orderEntry type="library" name="ProjectManagerLibrary" level="project" />
-    <orderEntry type="library" name="com.microsoft.azure:azure-core:0.7.0" level="project" />
-    <orderEntry type="library" name="com.microsoft.azure:azure-management-compute:0.7.0" level="project" />
-    <orderEntry type="library" name="com.microsoft.azure:azure-management-storage:0.7.0" level="project" />
-    <orderEntry type="library" name="com.microsoft.azure:azure-management:0.7.0" level="project" />
     <orderEntry type="library" name="com.nimbusds:nimbus-jose-jwt:2.11.0" level="project" />
     <orderEntry type="library" name="org.apache.httpcomponents:fluent-hc:4.3.5" level="project" />
     <orderEntry type="library" name="org.apache.httpcomponents:httpclient-cache:4.3.5" level="project" />
@@ -26,5 +22,6 @@
     <orderEntry type="library" name="azure-graph-api" level="project" />
     <orderEntry type="library" name="com.microsoft.azure:azure-storage:1.3.1" level="project" />
     <orderEntry type="library" name=".cspack" level="project" />
+    <orderEntry type="library" name="azure-sdk" level="project" />
   </component>
 </module>
diff --git a/msopentech-tools-for-intellij.zip b/msopentech-tools-for-intellij.zip
diff --git a/src/android/com/microsoftopentechnologies/intellij/serviceexplorer/azure/vm/VMNode.java b/src/android/com/microsoftopentechnologies/intellij/serviceexplorer/azure/vm/VMNode.java
@@ -171,7 +171,7 @@ private interface VMActionRunnable {
 
     private void runVMAction(
             String promptMessage,
-            String progressMessage,
+            final String progressMessage,
             final VMActionRunnable action) {
         final int optionDialog = JOptionPane.showOptionDialog(null,
                 promptMessage,
@@ -192,7 +192,7 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
                         // reload vm details
                         refreshItems();
                     } catch (AzureCmdException ex) {
-                        UIHelper.showException("Error shutting down virtual machine", ex);
+                        UIHelper.showException("Error " + progressMessage, ex);
                     }
 
                 }