Merge pull request #6263 from microsoft/fix-mac-stackoverflow

wangmingliang-ms · web-flow · commit d07a5f85e40e · 2021-12-24T11:02:06.000+08:00
fix mac stackoverflow
diff --git a/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azure/toolkit/eclipse/common/component/AzureComboBox.java b/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azure/toolkit/eclipse/common/component/AzureComboBox.java
@@ -18,6 +18,7 @@
 import javax.annotation.Nullable;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -274,6 +275,9 @@ public void setEnabled(boolean b) {
     }
 
     public boolean isEnabled() {
+        if (SystemUtils.IS_OS_MAC) {
+            return this.enabled;
+        }
         return this.enabled || this.viewer.isEnabled();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`import javax.annotation.Nullable;`
`19`	`19`
`20`	`20`	`import org.apache.commons.lang3.StringUtils;`
	`21`	`+import org.apache.commons.lang3.SystemUtils;`
`21`	`22`	`import org.apache.commons.lang3.exception.ExceptionUtils;`
`22`	`23`	`import org.eclipse.jface.viewers.ArrayContentProvider;`
`23`	`24`	`import org.eclipse.jface.viewers.LabelProvider;`
`@@ -274,6 +275,9 @@ public void setEnabled(boolean b) {`
`274`	`275`	`}`
`275`	`276`
`276`	`277`	`public boolean isEnabled() {`
	`278`	`+ if (SystemUtils.IS_OS_MAC) {`
	`279`	`+ return this.enabled;`
	`280`	`+ }`
`277`	`281`	`return this.enabled \|\| this.viewer.isEnabled();`
`278`	`282`	`}`
`279`	`283`