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 05c4591402 cleanup of CodeActionsProvider.getCommands()
new eaf1858c81 Merge pull request #6345 from thurka/GH-6113_1
05c4591402 is described below
commit 05c45914024f0389fab859cbf79c34e9aa66e069
Author: Tomas Hurka <[email protected]>
AuthorDate: Tue Aug 15 18:30:58 2023 +0200
cleanup of CodeActionsProvider.getCommands()
---
.../netbeans/modules/java/lsp/server/db/DBCommandProvider.java | 9 +--------
.../modules/java/lsp/server/db/DBConnectionProvider.java | 9 +--------
.../modules/java/lsp/server/protocol/TestClassGenerator.java | 4 +---
.../server/refactoring/ChangeMethodParametersRefactoring.java | 4 +---
.../modules/java/lsp/server/refactoring/MoveRefactoring.java | 3 +--
.../modules/java/lsp/server/refactoring/PullUpRefactoring.java | 3 +--
.../modules/java/lsp/server/refactoring/PushDownRefactoring.java | 3 +--
7 files changed, 7 insertions(+), 28 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBCommandProvider.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBCommandProvider.java
index 845b8af04e..79850e77fb 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBCommandProvider.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBCommandProvider.java
@@ -18,9 +18,7 @@
*/
package org.netbeans.modules.java.lsp.server.db;
-import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
@@ -29,7 +27,6 @@ import org.eclipse.lsp4j.CodeAction;
import org.eclipse.lsp4j.CodeActionParams;
import org.netbeans.api.db.explorer.ConnectionManager;
import org.netbeans.api.db.explorer.DatabaseConnection;
-import org.netbeans.modules.java.lsp.server.explorer.TreeItem;
import org.netbeans.modules.java.lsp.server.explorer.TreeNodeRegistry;
import org.netbeans.modules.java.lsp.server.protocol.CodeActionsProvider;
import org.netbeans.modules.java.lsp.server.protocol.NbCodeLanguageClient;
@@ -46,10 +43,6 @@ import org.openide.util.lookup.ServiceProvider;
public class DBCommandProvider extends CodeActionsProvider {
private static final String COMMAND_GET_PREFERRED_CONNECTION =
"java.db.preferred.connection";
- private static final Set<String> COMMANDS = new HashSet<>(Arrays.asList(
- COMMAND_GET_PREFERRED_CONNECTION
- ));
-
@Override
public List<CodeAction> getCodeActions(ResultIterator resultIterator,
CodeActionParams params) throws Exception {
return Collections.emptyList();
@@ -76,6 +69,6 @@ public class DBCommandProvider extends CodeActionsProvider {
@Override
public Set<String> getCommands() {
- return COMMANDS;
+ return Collections.singleton(COMMAND_GET_PREFERRED_CONNECTION);
}
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBConnectionProvider.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBConnectionProvider.java
index 09e2176663..d761d2044a 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBConnectionProvider.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBConnectionProvider.java
@@ -18,10 +18,8 @@
*/
package org.netbeans.modules.java.lsp.server.db;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -42,11 +40,6 @@ import org.openide.util.lookup.ServiceProvider;
@ServiceProvider(service = CodeActionsProvider.class)
public class DBConnectionProvider extends CodeActionsProvider{
private static final String GET_DB_CONNECTION = "java.db.connection";
//NOI18N
-
- private static final Set<String> COMMANDS = new HashSet<>(Arrays.asList(
- GET_DB_CONNECTION
- ));
-
@Override
public List<CodeAction> getCodeActions(ResultIterator resultIterator,
CodeActionParams params) throws Exception {
@@ -74,6 +67,6 @@ public class DBConnectionProvider extends CodeActionsProvider{
@Override
public Set<String> getCommands() {
- return COMMANDS;
+ return Collections.singleton(GET_DB_CONNECTION);
}
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestClassGenerator.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestClassGenerator.java
index 7a352e0787..cc1d3a0032 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestClassGenerator.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestClassGenerator.java
@@ -77,8 +77,6 @@ public final class TestClassGenerator extends
CodeActionsProvider {
private static final String GENERATE_TEST_CLASS_COMMAND =
"java.generate.testClass";
- private final Set<String> commands =
Collections.singleton(GENERATE_TEST_CLASS_COMMAND);
-
@Override
@NbBundle.Messages({
"# {0} - the testing framework to be used, e.g. JUnit, TestNG,...",
@@ -133,7 +131,7 @@ public final class TestClassGenerator extends
CodeActionsProvider {
@Override
public Set<String> getCommands() {
- return commands;
+ return Collections.singleton(GENERATE_TEST_CLASS_COMMAND);
}
@Override
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java
index 9d4dc2eb66..578a5f24ef 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java
@@ -25,7 +25,6 @@ import com.sun.source.util.Trees;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.EnumSet;
@@ -80,7 +79,6 @@ public final class ChangeMethodParametersRefactoring extends
CodeRefactoring {
private static final String CHANGE_METHOD_PARAMS_REFACTORING_KIND =
"refactor.change.method.params";
private static final String CHANGE_METHOD_PARAMS_REFACTORING_COMMAND =
"java.refactor.change.method.params";
- private final Set<String> commands =
Collections.singleton(CHANGE_METHOD_PARAMS_REFACTORING_COMMAND);
private final Gson gson = new Gson();
@Override
@@ -132,7 +130,7 @@ public final class ChangeMethodParametersRefactoring
extends CodeRefactoring {
@Override
public Set<String> getCommands() {
- return commands;
+ return Collections.singleton(CHANGE_METHOD_PARAMS_REFACTORING_COMMAND);
}
@Override
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
index 2859acbd24..8b1ce315ac 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
@@ -102,7 +102,6 @@ public final class MoveRefactoring extends CodeRefactoring {
private static final String MOVE_REFACTORING_COMMAND =
"java.refactor.move";
private static final ClassPath EMPTY_PATH =
ClassPathSupport.createClassPath(new URL[0]);
- private final Set<String> commands =
Collections.singleton(MOVE_REFACTORING_COMMAND);
private final Gson gson = new Gson();
@Override
@@ -136,7 +135,7 @@ public final class MoveRefactoring extends CodeRefactoring {
@Override
public Set<String> getCommands() {
- return commands;
+ return Collections.singleton(MOVE_REFACTORING_COMMAND);
}
@Override
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PullUpRefactoring.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PullUpRefactoring.java
index a53afcf719..ca063171ba 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PullUpRefactoring.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PullUpRefactoring.java
@@ -78,7 +78,6 @@ public final class PullUpRefactoring extends CodeRefactoring {
private static final String PULL_UP_REFACTORING_KIND = "refactor.pull.up";
private static final String PULL_UP_REFACTORING_COMMAND =
"java.refactor.pull.up";
- private final Set<String> commands =
Collections.singleton(PULL_UP_REFACTORING_COMMAND);
private final Gson gson = new Gson();
@Override
@@ -131,7 +130,7 @@ public final class PullUpRefactoring extends
CodeRefactoring {
@Override
public Set<String> getCommands() {
- return commands;
+ return Collections.singleton(PULL_UP_REFACTORING_COMMAND);
}
@Override
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PushDownRefactoring.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PushDownRefactoring.java
index 6acfa1537e..0bbc84c123 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PushDownRefactoring.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PushDownRefactoring.java
@@ -74,7 +74,6 @@ public final class PushDownRefactoring extends
CodeRefactoring {
private static final String PUSH_DOWN_REFACTORING_KIND =
"refactor.push.down";
private static final String PUSH_DOWN_REFACTORING_COMMAND =
"java.refactor.push.down";
- private final Set<String> commands =
Collections.singleton(PUSH_DOWN_REFACTORING_COMMAND);
private final Gson gson = new Gson();
@Override
@@ -142,7 +141,7 @@ public final class PushDownRefactoring extends
CodeRefactoring {
@Override
public Set<String> getCommands() {
- return commands;
+ return Collections.singleton(PUSH_DOWN_REFACTORING_COMMAND);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
