commit 6155cbf31a59545ba2f2a66521449ea2e388e713
author Svatopluk Dedic <svatopluk.dedic@oracle.com> Thu Aug 04 00:40:02 2022 +0200
committer GitHub <noreply@github.com> Thu Aug 04 00:40:02 2022 +0200
tree 3be0ea56ce78f28049e107ee87b61ccdafbafc28
parent 06a31ed66a97a0be7c9c9fe2a2fc0477f7b7e8b9
parent 1afce610699bc3a579ffa38e1218b62339d23260

Merge pull request #4461 from sdedic/sdedic/admsupport

Support for vulnerability audit in Oracle cloud

java/java.lsp.server/vscode/package.json

diff --git a/java/java.lsp.server/vscode/package.json b/java/java.lsp.server/vscode/package.json
index 6eb4935..7658d06 100644
--- a/java/java.lsp.server/vscode/package.json
+++ b/java/java.lsp.server/vscode/package.json
@@ -75,7 +75,7 @@
 				{
 					"id": "cloud.resources",
 					"name": "Cloud",
-					"when": "nbJavaLSReady"
+					"when": "nbJavaLSReady && config.netbeans.javaSupport.enabled"
 				},
 				{
 					"id": "run-config",

java/java.lsp.server/vscode/src/extension.ts

diff --git a/java/java.lsp.server/vscode/src/extension.ts b/java/java.lsp.server/vscode/src/extension.ts
index 37a7079..0bbe6da 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -307,7 +307,7 @@
                     if (DISABLE_EXTENSION === selected) {
                         vscode.commands.executeCommand('workbench.extensions.action.showInstalledExtensions');
                     } else if (DISABLE_JAVA === selected) {
-                        conf.update("netbeans.javaSupport.enabled", true, false);
+                        conf.update("netbeans.javaSupport.enabled", false, true);
                     }
                 });
             }
@@ -963,7 +963,9 @@
             }
 
             createDatabaseView(c);
-            c.findTreeViewService().createView('cloud.resources', undefined, { canSelectMany : false });
+            if (enableJava) {
+                c.findTreeViewService().createView('cloud.resources', undefined, { canSelectMany : false });
+            }
         }).catch(setClient[1]);
     }).catch((reason) => {
         activationPending = false;