kie issues#685: DMN Editor: Import Java Classes button is not enabled (…

…apache#2045)
fantonangeli · Nov 14, 2023 · 8bc7e3f · 8bc7e3f
1 parent 097dc96
commit 8bc7e3f
Show file tree

Hide file tree

Showing 32 changed files with 7 additions and 41 deletions.
diff --git a/packages/bpmn-vscode-extension/package.json b/packages/bpmn-vscode-extension/package.json
@@ -101,9 +101,6 @@
         "viewType": "kieKogitoWebviewEditorsBpmn"
       }
     ],
-    "javaExtensions": [
-      "./dist/server/vscode-java-code-completion-extension-plugin-core.jar"
-    ],
     "languages": [
       {
         "aliases": [

diff --git a/packages/import-java-classes-component/src/i18n/locales/en.ts b/packages/import-java-classes-component/src/i18n/locales/en.ts
@@ -25,7 +25,7 @@ export const en: ImportJavaClassesWizardI18n = {
   modalButton: {
     text: "Import Java classes",
     disabledMessage:
-      "Not available, please check if 'Language Support for Java by Red Hat' extension is correctly installed and the @KieActivator annotation is present",
+      "Not available, please check if 'Language Support for Java by Red Hat' extension is correctly installed and the Activator Java Class is present in your project.",
     errorMessage: "An error occurred. Please check your WebView Developer Tools",
   },
   modalWizard: {

diff --git a/packages/vscode-java-code-completion-extension-plugin/pom.xml b/packages/vscode-java-code-completion-extension-plugin/pom.xml
@@ -42,7 +42,7 @@
     <tycho.scmUrl>scm:git:https://github.com/kiegroup/kie-tools.git</tycho.scmUrl>
     <tycho.generateSourceReferences>true</tycho.generateSourceReferences>
     <!-- Using a SNAPSHOT version because of https://github.com/eclipse/eclipse.jdt.ls/issues/1970 -->
-    <jdt.ls.version>1.28.0-SNAPSHOT</jdt.ls.version>
+    <jdt.ls.version>1.29.0-SNAPSHOT</jdt.ls.version>
     <tycho.test.platformArgs />
     <tycho.test.jvmArgs>-Xmx512m ${tycho.test.platformArgs}</tycho.test.jvmArgs>
 

diff --git a/...n-extension-plugin/vscode-java-code-completion-extension-plugin-core/META-INF/MANIFEST.MF b/...n-extension-plugin/vscode-java-code-completion-extension-plugin-core/META-INF/MANIFEST.MF
@@ -11,9 +11,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.lsp4j.jsonrpc
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-ClassPath: lib/freemarker-2.3.31.jar,
- .
-Import-Package: com.google.gson,
- com.google.gson.stream
-
-
+Bundle-ClassPath: lib/freemarker-2.3.32.jar, .
+Import-Package: com.google.gson, com.google.gson.stream
diff --git a/...etion-extension-plugin/vscode-java-code-completion-extension-plugin-core/build.properties b/...etion-extension-plugin/vscode-java-code-completion-extension-plugin-core/build.properties
@@ -16,12 +16,11 @@
 # specific language governing permissions and limitations
 # under the License. 
 #
-
-ource..=src/main/java/
+source..=src/main/java/
 output..=target/classes/
 bin.includes=plugin.xml,\
              META-INF/,\
              src/main/resources/templates,\
-             lib/freemarker-2.3.31.jar,\
+             lib/freemarker-2.3.32.jar,\
              .
 src.includes=src/main/java
diff --git a/...ode-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/pom.xml b/...ode-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/pom.xml
@@ -16,7 +16,7 @@
   <description>vscode-java-code-completion-extension-plugin-core</description>
 
   <properties>
-    <version.org.freemarker>2.3.31</version.org.freemarker>
+    <version.org.freemarker>2.3.32</version.org.freemarker>
     <version.org.assertj>3.23.1</version.org.assertj>
     <version.org.junit.jupiter>5.9.1</version.org.junit.jupiter>
     <version.org.mockito>4.8.0</version.org.mockito>

diff --git a/...pletion-extension-plugin-core/src/main/java/org/kogito/core/internal/DelegateHandler.java b/...pletion-extension-plugin-core/src/main/java/org/kogito/core/internal/DelegateHandler.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal;
 
 import java.util.List;

diff --git a/...tion-extension-plugin-core/src/main/java/org/kogito/core/internal/ExtensionActivator.java b/...tion-extension-plugin-core/src/main/java/org/kogito/core/internal/ExtensionActivator.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal;
 
 import org.osgi.framework.BundleActivator;

diff --git a/...on-extension-plugin-core/src/main/java/org/kogito/core/internal/api/GetClassesResult.java b/...on-extension-plugin-core/src/main/java/org/kogito/core/internal/api/GetClassesResult.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.api;
 
 public class GetClassesResult {

diff --git a/...extension-plugin-core/src/main/java/org/kogito/core/internal/api/GetPublicParameters.java b/...extension-plugin-core/src/main/java/org/kogito/core/internal/api/GetPublicParameters.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.api;
 
 public class GetPublicParameters {

diff --git a/...ion-extension-plugin-core/src/main/java/org/kogito/core/internal/api/GetPublicResult.java b/...ion-extension-plugin-core/src/main/java/org/kogito/core/internal/api/GetPublicResult.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.api;
 
 public class GetPublicResult {

diff --git a/...xtension-plugin-core/src/main/java/org/kogito/core/internal/engine/ActivationChecker.java b/...xtension-plugin-core/src/main/java/org/kogito/core/internal/engine/ActivationChecker.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.engine;
 
 import java.nio.file.Path;

diff --git a/...plugin-core/src/main/java/org/kogito/core/internal/engine/ActivationCheckerException.java b/...plugin-core/src/main/java/org/kogito/core/internal/engine/ActivationCheckerException.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.engine;
 
 public class ActivationCheckerException extends RuntimeException {

diff --git a/...sion-plugin-core/src/main/java/org/kogito/core/internal/engine/ActivationFileVisitor.java b/...sion-plugin-core/src/main/java/org/kogito/core/internal/engine/ActivationFileVisitor.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.engine;
 
 import java.io.IOException;

diff --git a/...extension-plugin-core/src/main/java/org/kogito/core/internal/engine/BuildInformation.java b/...extension-plugin-core/src/main/java/org/kogito/core/internal/engine/BuildInformation.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.engine;
 
 import java.nio.file.Path;

diff --git a/...etion-extension-plugin-core/src/main/java/org/kogito/core/internal/engine/JavaEngine.java b/...etion-extension-plugin-core/src/main/java/org/kogito/core/internal/engine/JavaEngine.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.engine;
 
 import java.io.IOException;

diff --git a/...tension-plugin-core/src/main/java/org/kogito/core/internal/engine/TemplateParameters.java b/...tension-plugin-core/src/main/java/org/kogito/core/internal/engine/TemplateParameters.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.engine;
 
 public class TemplateParameters {

diff --git a/...letion-extension-plugin-core/src/main/java/org/kogito/core/internal/engine/Templates.java b/...letion-extension-plugin-core/src/main/java/org/kogito/core/internal/engine/Templates.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.engine;
 
 public class Templates {

diff --git a/...plugin-core/src/main/java/org/kogito/core/internal/engine/exceptions/EngineException.java b/...plugin-core/src/main/java/org/kogito/core/internal/engine/exceptions/EngineException.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.engine.exceptions;
 
 public class EngineException extends RuntimeException {

diff --git a/...sion-plugin-core/src/main/java/org/kogito/core/internal/handlers/AutocompleteHandler.java b/...sion-plugin-core/src/main/java/org/kogito/core/internal/handlers/AutocompleteHandler.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.handlers;
 
 import java.nio.file.Path;

diff --git a/...sion-plugin-core/src/main/java/org/kogito/core/internal/handlers/GetAccessorsHandler.java b/...sion-plugin-core/src/main/java/org/kogito/core/internal/handlers/GetAccessorsHandler.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.handlers;
 
 import java.util.List;

diff --git a/...ension-plugin-core/src/main/java/org/kogito/core/internal/handlers/GetClassesHandler.java b/...ension-plugin-core/src/main/java/org/kogito/core/internal/handlers/GetClassesHandler.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.handlers;
 
 import java.util.List;

diff --git a/...letion-extension-plugin-core/src/main/java/org/kogito/core/internal/handlers/Handler.java b/...letion-extension-plugin-core/src/main/java/org/kogito/core/internal/handlers/Handler.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.handlers;
 
 import java.util.List;

diff --git a/...tension-plugin-core/src/main/java/org/kogito/core/internal/handlers/HandlerConstants.java b/...tension-plugin-core/src/main/java/org/kogito/core/internal/handlers/HandlerConstants.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.handlers;
 
 public class HandlerConstants {

diff --git a/...ore/src/main/java/org/kogito/core/internal/handlers/IsLanguageServerAvailableHandler.java b/...ore/src/main/java/org/kogito/core/internal/handlers/IsLanguageServerAvailableHandler.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.handlers;
 
 import java.util.List;

diff --git a/...tion-extension-plugin-core/src/main/java/org/kogito/core/internal/util/WorkspaceUtil.java b/...tion-extension-plugin-core/src/main/java/org/kogito/core/internal/util/WorkspaceUtil.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.util;
 
 import java.util.Arrays;

diff --git a/...sion-plugin-core/src/test/java/org/kogito/core/internal/engine/ActivationCheckerTest.java b/...sion-plugin-core/src/test/java/org/kogito/core/internal/engine/ActivationCheckerTest.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.engine;
 
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...-plugin-core/src/test/java/org/kogito/core/internal/engine/ActivationFileVisitorTest.java b/...-plugin-core/src/test/java/org/kogito/core/internal/engine/ActivationFileVisitorTest.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.engine;
 
 import java.io.File;

diff --git a/...n-extension-plugin-core/src/test/java/org/kogito/core/internal/engine/JavaEngineTest.java b/...n-extension-plugin-core/src/test/java/org/kogito/core/internal/engine/JavaEngineTest.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.engine;
 
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...-plugin-core/src/test/java/org/kogito/core/internal/handlers/GetAccessorsHandlerTest.java b/...-plugin-core/src/test/java/org/kogito/core/internal/handlers/GetAccessorsHandlerTest.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.handlers;
 
 import java.util.Map;

diff --git a/...src/test/java/org/kogito/core/internal/handlers/IsLanguageServerAvailableHandlerTest.java b/...src/test/java/org/kogito/core/internal/handlers/IsLanguageServerAvailableHandlerTest.java
@@ -17,7 +17,6 @@
  * under the License. 
  */
 
-
 package org.kogito.core.internal.handlers;
 
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...ompletion-extension-plugin-core/src/test/java/org/kogito/core/internal/util/TestUtil.java b/...ompletion-extension-plugin-core/src/test/java/org/kogito/core/internal/util/TestUtil.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License. 
  */
-
 package org.kogito.core.internal.util;
 
 import org.mockito.MockedStatic;
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
      * under the License.
      */
     package org.kogito.core.internal;
     import java.util.List;
@@ Expand Down @@