You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by th...@apache.org on 2023/08/09 09:08:25 UTC

[netbeans] branch master updated: Allow to select 'Add Database Connection' or 'Add Oracle Autonomous DB' from database view toolbar

This is an automated email from the ASF dual-hosted git repository.

thurka pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new 3d9b2ee0b3 Allow to select 'Add Database Connection' or 'Add Oracle Autonomous DB' from database view toolbar
     new 5fc6c7ab48 Merge pull request #6281 from thurka/GCN-1397
3d9b2ee0b3 is described below

commit 3d9b2ee0b3d4dfce6d8bcf3c87d3fc9f2f25aa4f
Author: Tomas Hurka <to...@gmail.com>
AuthorDate: Tue Aug 1 12:33:12 2023 +0200

    Allow to select 'Add Database Connection' or 'Add Oracle Autonomous DB' from database view toolbar
---
 java/java.lsp.server/vscode/package.json     | 12 ++++++++++--
 java/java.lsp.server/vscode/src/extension.ts | 10 ++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/java/java.lsp.server/vscode/package.json b/java/java.lsp.server/vscode/package.json
index 16c9d24b61..80841e6d6c 100644
--- a/java/java.lsp.server/vscode/package.json
+++ b/java/java.lsp.server/vscode/package.json
@@ -491,11 +491,15 @@
 				"title": "Delete"
 			},
 			{
-				"command": "db.add.connection",
+				"command": "db.add.all.connection",
 				"title": "Add Database Connection",
 				"category": "Database",
 				"icon": "$(add)"
 			},
+			{
+				"command": "db.add.connection",
+				"title": "Add JDBC Database Connection"
+			},
 			{
 				"command": "nbls:Database:netbeans.db.explorer.action.Connect",
 				"title": "Connect to Database"
@@ -725,6 +729,10 @@
 					"command": "java.workspace.configureRunSettings",
 					"when": "false"
 				},
+				{
+					"command": "db.add.all.connection",
+					"when": "false"
+				},
 				{
 					"command": "nbls.addEventListener",
 					"when": "false"
@@ -757,7 +765,7 @@
 					"when": "nbJavaLSReady && view == foundProjects && config.netbeans.javaSupport.enabled"
 				},
 				{
-					"command": "db.add.connection",
+					"command": "db.add.all.connection",
 					"when": "view == database.connections",
 					"group": "navigation@3"
 				}
diff --git a/java/java.lsp.server/vscode/src/extension.ts b/java/java.lsp.server/vscode/src/extension.ts
index 8ce5fe55b4..0601f31ed5 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -538,6 +538,16 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
             await commands.executeCommand(selected.userData.command.command, ...(selected.userData.command.arguments || []));
         }
     }));
+    context.subscriptions.push(commands.registerCommand('db.add.all.connection', async () => {
+        const ADD_JDBC = 'Add Database Connection';
+        const ADD_ADB = 'Add Oracle Autonomous DB';
+        const selected: any = await window.showQuickPick([ADD_JDBC, ADD_ADB], { placeHolder: 'Select type...' });
+        if (selected == ADD_JDBC) {
+            await commands.executeCommand('db.add.connection');
+        } else if (selected == ADD_ADB) {
+            await commands.executeCommand('nbls:Tools:org.netbeans.modules.cloud.oracle.actions.AddADBAction');
+        }
+    }));
     const mergeWithLaunchConfig = (dconfig : vscode.DebugConfiguration) => {
         const folder = vscode.workspace.workspaceFolders?.[0];
         const uri = folder?.uri;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists