This is an automated email from the ASF dual-hosted git repository.
mbien 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 9136a44aaf Display `Faces VERSION` instead of `JSF VERSION` when
version is at least 4.0
new e584fabd77 Merge pull request #6564 from asbachb/6492-rename-jsf-faces
9136a44aaf is described below
commit 9136a44aaffd87567b2ee09ff9ebe05607466e88
Author: Benjamin Asbach <[email protected]>
AuthorDate: Fri Oct 13 10:20:34 2023 +0200
Display `Faces VERSION` instead of `JSF VERSION` when version is at least
4.0
The name was adjusted in Jakarta Faces Specification 4.0
see #6492
---
.../web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfVersion.java | 3 +++
.../unit/src/org/netbeans/modules/web/jsfapi/api/JsfVersionTest.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git
a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfVersion.java
b/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfVersion.java
index be16c5265d..c112201d82 100644
---
a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfVersion.java
+++
b/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfVersion.java
@@ -43,6 +43,9 @@ public enum JsfVersion {
}
public String getShortName() {
+ if (isAtLeast(JSF_4_0)) {
+ return "Faces " + version;
+ }
return "JSF " + version;
}
diff --git
a/enterprise/web.jsfapi/test/unit/src/org/netbeans/modules/web/jsfapi/api/JsfVersionTest.java
b/enterprise/web.jsfapi/test/unit/src/org/netbeans/modules/web/jsfapi/api/JsfVersionTest.java
index 79d51b412e..e58f614195 100644
---
a/enterprise/web.jsfapi/test/unit/src/org/netbeans/modules/web/jsfapi/api/JsfVersionTest.java
+++
b/enterprise/web.jsfapi/test/unit/src/org/netbeans/modules/web/jsfapi/api/JsfVersionTest.java
@@ -174,7 +174,7 @@ public class JsfVersionTest {
assertEquals("JSF 2.2", JsfVersion.JSF_2_2.getShortName());
assertEquals("JSF 2.3", JsfVersion.JSF_2_3.getShortName());
assertEquals("JSF 3.0", JsfVersion.JSF_3_0.getShortName());
- assertEquals("JSF 4.0", JsfVersion.JSF_4_0.getShortName());
+ assertEquals("Faces 4.0", JsfVersion.JSF_4_0.getShortName());
}
@Test
---------------------------------------------------------------------
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
