diff --git a/j2ee.common/manifest.mf b/j2ee.common/manifest.mf --- a/j2ee.common/manifest.mf +++ b/j2ee.common/manifest.mf @@ -2,5 +2,5 @@ OpenIDE-Module: org.netbeans.modules.j2ee.common/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/common/Bundle.properties OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker -OpenIDE-Module-Specification-Version: 1.74 +OpenIDE-Module-Specification-Version: 1.75 AutoUpdate-Show-In-Client: false diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java @@ -153,6 +153,24 @@ return EjbSupport.getInstance(platform).isEjb31LiteSupported(platform); } + public static boolean isAtLeastJavaEE5(Profile profile) { + if (profile.equals(Profile.JAVA_EE_5) || isAtLeastJavaEE6(profile)) { + return true; + } + return false; + } + + public static boolean isAtLeastJavaEE6(Profile profile) { + if (profile.equals(Profile.JAVA_EE_6_WEB) || + profile.equals(Profile.JAVA_EE_6_FULL) || + profile.equals(Profile.JAVA_EE_7_WEB) || + profile.equals(Profile.JAVA_EE_7_FULL)) { + + return true; + } + return false; + } + public boolean hasDefaultPersistenceProvider() { J2eePlatform platform = Util.getPlatform(project); if (platform == null) { diff --git a/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java b/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java --- a/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java +++ b/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java @@ -72,6 +72,28 @@ super(testName); } + public void testIsHigherJavaEEVersionJavaEE5() { + assertFalse(J2eeProjectCapabilities.isAtLeastJavaEE5(Profile.J2EE_13)); + assertFalse(J2eeProjectCapabilities.isAtLeastJavaEE5(Profile.J2EE_14)); + + assertTrue(J2eeProjectCapabilities.isAtLeastJavaEE5(Profile.JAVA_EE_5)); + assertTrue(J2eeProjectCapabilities.isAtLeastJavaEE5(Profile.JAVA_EE_6_FULL)); + assertTrue(J2eeProjectCapabilities.isAtLeastJavaEE5(Profile.JAVA_EE_6_WEB)); + assertTrue(J2eeProjectCapabilities.isAtLeastJavaEE5(Profile.JAVA_EE_7_FULL)); + assertTrue(J2eeProjectCapabilities.isAtLeastJavaEE5(Profile.JAVA_EE_7_WEB)); + } + + public void testIsHigherJavaEEVersionJavaEE6full() { + assertFalse(J2eeProjectCapabilities.isAtLeastJavaEE6(Profile.J2EE_13)); + assertFalse(J2eeProjectCapabilities.isAtLeastJavaEE6(Profile.J2EE_14)); + assertFalse(J2eeProjectCapabilities.isAtLeastJavaEE6(Profile.JAVA_EE_5)); + + assertTrue(J2eeProjectCapabilities.isAtLeastJavaEE6(Profile.JAVA_EE_6_WEB)); + assertTrue(J2eeProjectCapabilities.isAtLeastJavaEE6(Profile.JAVA_EE_6_FULL)); + assertTrue(J2eeProjectCapabilities.isAtLeastJavaEE6(Profile.JAVA_EE_7_WEB)); + assertTrue(J2eeProjectCapabilities.isAtLeastJavaEE6(Profile.JAVA_EE_7_FULL)); + } + public void testIsEjbSupported() throws Exception { Project p = createProject(Profile.JAVA_EE_5, Type.EJB); J2eeProjectCapabilities cap = J2eeProjectCapabilities.forProject(p);