Merge pull request #502 from mezarin/cleanup

Tidy up incorrect file entries
eclipse · Oct 31, 2023 · fab7add · fab7add
2 parents 3112496 + 5dc1ec1
commit fab7add
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/schema/javaFeatureParticipants.exsd b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/schema/javaFeatureParticipants.exsd
@@ -148,7 +148,7 @@
          The following is an example of a java feature participant extension:
 
 &lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.lsp4mp.jdt.core.javaFeatureParticipants&quot;&gt;
+ &lt;extension point=&quot;org.eclipse.lsp4jakarta.jdt.core.javaFeatureParticipants&quot;&gt;
   &lt;diagnostics
    class=&quot;com.example.MyJavaDiagnosticsParticipant&quot;&gt;
   &lt;/diagnostics&gt;

diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/schema/projectLabelProviders.exsd b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/schema/projectLabelProviders.exsd
@@ -57,7 +57,7 @@ Some example labels are: &quot;maven&quot;, &quot;gradle&quot; and &quot;jakarta
                   Name of a class that implements IProjectLabelProvider.
                </documentation>
                <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.lsp4mp.jdt.core.IProjectLabelProvider"/>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.lsp4jakarta.jdt.core.IProjectLabelProvider"/>
                </appinfo>
             </annotation>
          </attribute>

diff --git a/...dt.core/src/main/java/org/eclipse/lsp4jakarta/commons/codeaction/JakartaCodeActionId.java b/...dt.core/src/main/java/org/eclipse/lsp4jakarta/commons/codeaction/JakartaCodeActionId.java
@@ -14,10 +14,11 @@
 package org.eclipse.lsp4jakarta.commons.codeaction;
 
 /**
- * Represents id of an lsp4mp code action.
+ * LSP4Jakarta code action id.
+ *
+ * Based on: https://github.com/eclipse/lsp4mp/blob/0.9.0/microprofile.ls/org.eclipse.lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/commons/codeaction/MicroProfileCodeActionId.java
  */
 public enum JakartaCodeActionId implements ICodeActionId {
-    IgnoreUnknownProperty,
     // JAXRS
     jaxrsInsertPublicCtrtToClass,
     MakeConstructorPublic,

diff --git a/...4jakarta.jdt.core/src/main/java/org/eclipse/lsp4jakarta/jdt/core/ProjectLabelManager.java b/...4jakarta.jdt.core/src/main/java/org/eclipse/lsp4jakarta/jdt/core/ProjectLabelManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2019-2020 Red Hat Inc. and others.
+* Copyright (c) 2019-2023 Red Hat Inc. and others.
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
  * Project label manager which provides <code>ProjectLabelInfo</code> containing
  * project labels for all projects in the workspace
  *
+ * Based on: https://github.com/eclipse/lsp4mp/blob/0.9.0/microprofile.jdt/org.eclipse.lsp4mp.jdt.core/src/main/java/org/eclipse/lsp4mp/jdt/core/ProjectLabelManager.java
  */
 public class ProjectLabelManager {
     private static final ProjectLabelManager INSTANCE = new ProjectLabelManager();
@@ -129,8 +130,8 @@ private List<String> getProjectLabels(IProject project, List<String> types) {
         }
 
         // Update labels by using the
-        // "org.eclipse.lsp4mp.jdt.core.projectLabelProviders" extension point (ex
-        // : "maven", "gradle", "quarkus", "jakarta").
+        // "org.eclipse.lsp4jakarta.jdt.core.projectLabelProviders" extension point (ex
+        // : "maven", "gradle", "jakarta").
         List<String> projectLabels = new ArrayList<>();
         List<ProjectLabelDefinition> definitions = ProjectLabelRegistry.getInstance().getProjectLabelDefinitions();
         for (ProjectLabelDefinition definition : definitions) {

diff --git a/jakarta.jdt/pom.xml b/jakarta.jdt/pom.xml
@@ -34,7 +34,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <tycho.version>3.0.3</tycho.version>
         <tycho.extras.version>${tycho.version}</tycho.extras.version>
-        <tycho.scmUrl>scm:git:https://github.com/eclipse/lsp4mp</tycho.scmUrl>
+        <tycho.scmUrl>scm:git:https://github.com/eclipse/lsp4jakarta</tycho.scmUrl>
         <tycho.generateSourceReferences>true</tycho.generateSourceReferences>
         <jdt.ls.version>1.21.0.20230316144047</jdt.ls.version>
         <releases.repo.id>repo.eclipse.org</releases.repo.id>