(struts-intellij-plugin) branch feature/WW-5445-struts6 updated (492cf2f -> 63d9255)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5445-struts6 in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 492cf2f WW-5445 Registers Struts 6.0 DTD add 63d9255 WW-5445 Upgrade to support the latest IntelliJ No new revisions were added by this update. Summary of changes: build.gradle.kts| 4 ++-- .../java/com/intellij/struts2/annotators/ActionAnnotatorBase.java | 6 -- .../intellij/struts2/annotators/StrutsFileSetCheckingAnnotator.java | 2 +- src/main/java/com/intellij/struts2/facet/Struts2LibraryType.java| 2 +- .../java/com/intellij/struts2/facet/ui/FileSetConfigurationTab.java | 4 ++-- src/main/java/com/intellij/struts2/graph/StrutsDataModel.java | 3 ++- .../intellij/struts2/model/jam/convention/JamInterceptorRef.java| 2 +- .../intellij/struts2/velocity/VelocityStrutsResultContributor.java | 4 ++-- src/main/resources/META-INF/plugin.xml | 2 +- 9 files changed, 16 insertions(+), 13 deletions(-)
svn commit: r70854 - /dev/struts/idea-plugin/struts2-2024.4.1.zip
Author: lukaszlenart Date: Wed Aug 14 14:39:59 2024 New Revision: 70854 Log: Adds the latest plugin version Added: dev/struts/idea-plugin/struts2-2024.4.1.zip (with props) Added: dev/struts/idea-plugin/struts2-2024.4.1.zip == Binary file - no diff available. Propchange: dev/struts/idea-plugin/struts2-2024.4.1.zip -- svn:mime-type = application/octet-stream
(struts-intellij-plugin) branch main updated (b39ac19 -> e014920)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
from b39ac19 Merge pull request #5 from apache/feature/readme
add 0ab4d96 WW-5445 Adds support for Struts 6
add 492cf2f WW-5445 Registers Struts 6.0 DTD
add 63d9255 WW-5445 Upgrade to support the latest IntelliJ
new e014920 Merge pull request #2 from apache/feature/WW-5445-struts6
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle.kts | 6 ++---
.../intellij/struts2/Struts2ResourceProvider.java | 4 +++
.../java/com/intellij/struts2/StrutsConstants.java | 14 +++---
.../StrutsFileTemplateGroupDescriptorFactory.java | 7 +
.../struts2/StrutsFileTemplateProvider.java| 16
.../struts2/annotators/ActionAnnotatorBase.java| 6 +++--
.../annotators/StrutsFileSetCheckingAnnotator.java | 2 +-
.../intellij/struts2/facet/Struts2LibraryType.java | 2 +-
.../facet/StrutsFrameworkSupportProvider.java | 8 +++---
.../java/com/intellij/struts2/facet/struts2.xml| 30 +++---
.../struts2/facet/ui/FileSetConfigurationTab.java | 4 +--
.../intellij/struts2/graph/StrutsDataModel.java| 3 ++-
.../model/jam/convention/JamInterceptorRef.java| 2 +-
.../velocity/VelocityStrutsResultContributor.java | 4 +--
src/main/resources/META-INF/plugin.xml | 2 +-
.../resources/fileTemplates/j2ee/struts_6_0.xml.ft | 8 ++
.../j2ee/{struts.xml.html => struts_6_0.xml.html} | 2 +-
.../dtds/{struts-2.5.dtd => struts-6.0.dtd}| 14 ++
18 files changed, 88 insertions(+), 46 deletions(-)
create mode 100644 src/main/resources/fileTemplates/j2ee/struts_6_0.xml.ft
copy src/main/resources/fileTemplates/j2ee/{struts.xml.html =>
struts_6_0.xml.html} (85%)
copy src/main/resources/resources/dtds/{struts-2.5.dtd => struts-6.0.dtd} (91%)
Error while running github feature from refs/heads/main:.asf.yaml in struts-intellij-plugin!
An error occurred while running github feature in .asf.yaml!: [GitHub] Request error with message: "Branch not found". (status code: 404)
(struts-intellij-plugin) branch feature/WW-5445-struts6 deleted (was 63d9255)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5445-struts6 in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git was 63d9255 WW-5445 Upgrade to support the latest IntelliJ The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts-intellij-plugin) 01/01: Merge pull request #2 from apache/feature/WW-5445-struts6
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git commit e014920acbc43d04937351a1eb1bd063fde95642 Merge: b39ac19 63d9255 Author: Lukasz Lenart AuthorDate: Wed Aug 14 17:02:01 2024 +0200 Merge pull request #2 from apache/feature/WW-5445-struts6 WW-5445 Adds support for Struts 6 build.gradle.kts | 6 +- .../intellij/struts2/Struts2ResourceProvider.java | 4 + .../java/com/intellij/struts2/StrutsConstants.java | 14 +- .../StrutsFileTemplateGroupDescriptorFactory.java | 7 + .../struts2/StrutsFileTemplateProvider.java| 16 ++- .../struts2/annotators/ActionAnnotatorBase.java| 6 +- .../annotators/StrutsFileSetCheckingAnnotator.java | 2 +- .../intellij/struts2/facet/Struts2LibraryType.java | 2 +- .../facet/StrutsFrameworkSupportProvider.java | 8 +- .../java/com/intellij/struts2/facet/struts2.xml| 30 ++-- .../struts2/facet/ui/FileSetConfigurationTab.java | 4 +- .../intellij/struts2/graph/StrutsDataModel.java| 3 +- .../model/jam/convention/JamInterceptorRef.java| 2 +- .../velocity/VelocityStrutsResultContributor.java | 4 +- src/main/resources/META-INF/plugin.xml | 2 +- .../resources/fileTemplates/j2ee/struts_6_0.xml.ft | 8 ++ .../fileTemplates/j2ee/struts_6_0.xml.html | 7 + src/main/resources/resources/dtds/struts-6.0.dtd | 157 + 18 files changed, 242 insertions(+), 40 deletions(-)
svn commit: r70879 - /dev/struts/idea-plugin/struts-intellij-plugin-2024.4.2.zip
Author: lukaszlenart Date: Thu Aug 15 06:17:25 2024 New Revision: 70879 Log: WW-5446 fixes jsp highlighting Added: dev/struts/idea-plugin/struts-intellij-plugin-2024.4.2.zip (with props) Added: dev/struts/idea-plugin/struts-intellij-plugin-2024.4.2.zip == Binary file - no diff available. Propchange: dev/struts/idea-plugin/struts-intellij-plugin-2024.4.2.zip -- svn:mime-type = application/octet-stream
(struts-intellij-plugin) 01/01: WW-5446 Fixes JSP highlighting and navigating
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/WW-5446-jsp-clickable
in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
commit 5bd7959cfbad160a21c6fbcf08efbe18c5c6b152
Author: Lukasz Lenart
AuthorDate: Thu Aug 15 08:17:53 2024 +0200
WW-5446 Fixes JSP highlighting and navigating
---
build.gradle.kts | 2 +-
settings.gradle.kts | 2 +-
.../struts2/dom/inspection/Struts2ModelInspection.java| 11 +++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index e59fe01..40276ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
}
group = "com.intellij"
-version = "2024.4.1"
+version = "2024.4.2"
repositories {
mavenCentral()
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 116513b..3b7dc22 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,4 +5,4 @@ pluginManagement {
}
}
-rootProject.name = "Apache Struts IntelliJ IDEA plugin"
+rootProject.name = "struts-intellij-plugin"
diff --git
a/src/main/java/com/intellij/struts2/dom/inspection/Struts2ModelInspection.java
b/src/main/java/com/intellij/struts2/dom/inspection/Struts2ModelInspection.java
index f318593..5aaff29 100644
---
a/src/main/java/com/intellij/struts2/dom/inspection/Struts2ModelInspection.java
+++
b/src/main/java/com/intellij/struts2/dom/inspection/Struts2ModelInspection.java
@@ -16,6 +16,7 @@
package com.intellij.struts2.dom.inspection;
import com.intellij.codeInspection.options.OptPane;
+import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -34,6 +35,7 @@ import
com.intellij.struts2.dom.struts.action.StrutsPathReferenceConverter;
import com.intellij.struts2.dom.struts.impl.path.ResultTypeResolver;
import com.intellij.struts2.dom.struts.model.StrutsManager;
import com.intellij.struts2.dom.struts.strutspackage.ResultType;
+import com.intellij.struts2.facet.StrutsFrameworkSupportProvider;
import com.intellij.struts2.facet.ui.StrutsFileSet;
import com.intellij.util.io.URLUtil;
import com.intellij.util.xml.*;
@@ -55,6 +57,8 @@ import static
com.intellij.codeInspection.options.OptPane.pane;
*/
public class Struts2ModelInspection extends
BasicDomElementsInspection {
+ private static final Logger LOG =
Logger.getInstance(Struts2ModelInspection.class);
+
/**
* @noinspection PublicField
*/
@@ -89,6 +93,7 @@ public class Struts2ModelInspection extends
BasicDomElementsInspection fileSets =
StrutsManager.getInstance(xmlFile.getProject()).getAllConfigFileSets(module);
for (final StrutsFileSet strutsFileSet : fileSets) {
+ LOG.info("Checking file set: " + strutsFileSet);
if (strutsFileSet.hasFile(virtualFile)) {
super.checkFileElement(strutsRootDomFileElement, holder);
break;
@@ -166,6 +171,12 @@ public class Struts2ModelInspection extends
BasicDomElementsInspection
(struts-intellij-plugin) branch fix/WW-5446-jsp-clickable created (now 5bd7959)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5446-jsp-clickable in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git at 5bd7959 WW-5446 Fixes JSP highlighting and navigating This branch includes the following new commits: new 5bd7959 WW-5446 Fixes JSP highlighting and navigating The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
