This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/WW-5558-struts7
in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
commit 29aa78c77d189c92a8dac44fffa07b11c8e0be50
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Mon Aug 4 21:48:46 2025 +0200
WW-5558 Adds support for new Struts packages
---
.../dom/struts/strutspackage/Interceptor.java | 14 +++++---
.../dom/struts/strutspackage/ResultType.java | 40 ++++++++++++++--------
.../dom/validator/config/ValidatorConfig.java | 25 +++++++++-----
3 files changed, 53 insertions(+), 26 deletions(-)
diff --git
a/src/main/java/com/intellij/struts2/dom/struts/strutspackage/Interceptor.java
b/src/main/java/com/intellij/struts2/dom/struts/strutspackage/Interceptor.java
index 5271bb4..0d5df45 100644
---
a/src/main/java/com/intellij/struts2/dom/struts/strutspackage/Interceptor.java
+++
b/src/main/java/com/intellij/struts2/dom/struts/strutspackage/Interceptor.java
@@ -30,8 +30,14 @@ import com.intellij.util.xml.GenericAttributeValue;
@Presentation(typeName = "Interceptor", icon = "AllIcons.Nodes.Plugin")
public interface Interceptor extends InterceptorOrStackBase, ParamsElement {
- @Attribute(value = "class")
- @ExtendClass(value = "com.opensymphony.xwork2.interceptor.Interceptor",
allowAbstract = false, allowInterface = false)
- @Convert(ExtendableClassConverter.class)
- GenericAttributeValue<PsiClass> getInterceptorClass();
+ @Attribute(value = "class")
+ @ExtendClass(
+ value = {
+ "com.opensymphony.xwork2.interceptor.Interceptor",
+ "org.apache.struts2.interceptor.Interceptor"
+ },
+ allowAbstract = false,
+ allowInterface = false)
+ @Convert(ExtendableClassConverter.class)
+ GenericAttributeValue<PsiClass> getInterceptorClass();
}
diff --git
a/src/main/java/com/intellij/struts2/dom/struts/strutspackage/ResultType.java
b/src/main/java/com/intellij/struts2/dom/struts/strutspackage/ResultType.java
index 340ca78..c3d2f09 100644
---
a/src/main/java/com/intellij/struts2/dom/struts/strutspackage/ResultType.java
+++
b/src/main/java/com/intellij/struts2/dom/struts/strutspackage/ResultType.java
@@ -20,7 +20,13 @@ import com.intellij.psi.PsiClass;
import com.intellij.struts2.Struts2PresentationProvider;
import com.intellij.struts2.dom.ExtendableClassConverter;
import com.intellij.struts2.dom.params.ParamsElement;
-import com.intellij.util.xml.*;
+import com.intellij.util.xml.Attribute;
+import com.intellij.util.xml.Convert;
+import com.intellij.util.xml.ExtendClass;
+import com.intellij.util.xml.GenericAttributeValue;
+import com.intellij.util.xml.NameValue;
+import com.intellij.util.xml.Required;
+import com.intellij.util.xml.Stubbed;
import org.jetbrains.annotations.NotNull;
/**
@@ -32,19 +38,25 @@ import org.jetbrains.annotations.NotNull;
@Stubbed
public interface ResultType extends ParamsElement {
- @NameValue
- @Required
- @Stubbed
- @NotNull
- GenericAttributeValue<String> getName();
+ @NameValue
+ @Required
+ @Stubbed
+ @NotNull
+ GenericAttributeValue<String> getName();
- @Attribute(value = "class")
- @ExtendClass(value = "com.opensymphony.xwork2.Result", allowAbstract =
false, allowInterface = false)
- @Convert(ExtendableClassConverter.class)
- @Stubbed
- @Required
- GenericAttributeValue<PsiClass> getResultTypeClass();
+ @Attribute(value = "class")
+ @ExtendClass(
+ value = {
+ "com.opensymphony.xwork2.Result",
+ "org.apache.struts2.result.Result"
+ },
+ allowAbstract = false,
+ allowInterface = false)
+ @Convert(ExtendableClassConverter.class)
+ @Stubbed
+ @Required
+ GenericAttributeValue<PsiClass> getResultTypeClass();
- @Stubbed
- GenericAttributeValue<Boolean> getDefault();
+ @Stubbed
+ GenericAttributeValue<Boolean> getDefault();
}
\ No newline at end of file
diff --git
a/src/main/java/com/intellij/struts2/dom/validator/config/ValidatorConfig.java
b/src/main/java/com/intellij/struts2/dom/validator/config/ValidatorConfig.java
index d213708..29e4131 100644
---
a/src/main/java/com/intellij/struts2/dom/validator/config/ValidatorConfig.java
+++
b/src/main/java/com/intellij/struts2/dom/validator/config/ValidatorConfig.java
@@ -18,7 +18,13 @@ package com.intellij.struts2.dom.validator.config;
import com.intellij.ide.presentation.Presentation;
import com.intellij.psi.PsiClass;
import com.intellij.struts2.dom.StrutsDomConstants;
-import com.intellij.util.xml.*;
+import com.intellij.util.xml.Attribute;
+import com.intellij.util.xml.DomElement;
+import com.intellij.util.xml.ExtendClass;
+import com.intellij.util.xml.GenericAttributeValue;
+import com.intellij.util.xml.NameValue;
+import com.intellij.util.xml.Namespace;
+import com.intellij.util.xml.Required;
/**
* {@code validator} in validator-config.xml.
@@ -29,13 +35,16 @@ import com.intellij.util.xml.*;
@Presentation(typeName = "Validator", icon = "AllIcons.Actions.EditSource")
public interface ValidatorConfig extends DomElement {
- @NameValue
- @Required
- GenericAttributeValue<String> getName();
+ @NameValue
+ @Required
+ GenericAttributeValue<String> getName();
- @ExtendClass("com.opensymphony.xwork2.validator.Validator")
- @Attribute("class")
- @Required
- GenericAttributeValue<PsiClass> getValidatorClass();
+ @ExtendClass({
+ "com.opensymphony.xwork2.validator.Validator",
+ "org.apache.struts2.validator.Validator"
+ })
+ @Attribute("class")
+ @Required
+ GenericAttributeValue<PsiClass> getValidatorClass();
}
