commit 8c6f989557f6d287ff157d8b513ee0fb98a717b7
author Fred Bricon <fbricon@gmail.com> Wed May 16 16:26:56 2018 -0400
committer Fred Bricon <fbricon@gmail.com> Wed May 16 16:32:41 2018 -0400
tree 095530b8860e71835134f3c8adda5d8b7f3e945b
parent f95f1fe279995b300e0edd16caf400dc6fd8b8c5

Bug 534779: add support for application client 8

Signed-off-by: Fred Bricon <fbricon@gmail.com>

org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AcrPluginConfiguration.java

diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AcrPluginConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AcrPluginConfiguration.java
index 11e6855..1c18e69 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AcrPluginConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AcrPluginConfiguration.java
@@ -48,6 +48,7 @@
   private static final IProjectFacetVersion DEFAULT_APPCLIENT_FACET_VERSION = IJ2EEFacetConstants.APPLICATION_CLIENT_50;
   
   private static final int JEE_7_0_ID = 70;
+  private static final int JEE_8_0_ID = 80;
 
   private static final Logger LOG = LoggerFactory.getLogger(AcrPluginConfiguration.class);
   
@@ -71,9 +72,7 @@
     IFile applicationClientXml = getApplicationClientXml();
 
     if(applicationClientXml != null && applicationClientXml.isAccessible()) {
-      try {
-        InputStream is = applicationClientXml.getContents();
-        try {
+    	try (InputStream is = applicationClientXml.getContents()) {
           JavaEEQuickPeek jqp = new JavaEEQuickPeek(is);
           switch(jqp.getVersion()) {
             case J2EEVersionConstants.J2EE_1_2_ID:
@@ -90,15 +89,14 @@
             	//This can only happen when run in WTP >= 3.5
             	//Don't use/create a static 1.7 facet version, it'd blow up WTP < 3.5
                 return IJ2EEFacetConstants.APPLICATION_CLIENT_FACET.getVersion("7.0"); //$NON-NLS-1$
+            case JEE_8_0_ID:
+            	//This can only happen when run in WTP >= 3.5
+            	//Don't use/create a static 1.8 facet version, it'd blow up WTP < 3.5
+                return IJ2EEFacetConstants.APPLICATION_CLIENT_FACET.getVersion("8.0"); //$NON-NLS-1$
           }
-        } finally {
-          is.close();
-        }
-      } catch(IOException ex) {
+    	} catch(IOException | CoreException ex) {
         // expected
-      } catch(CoreException ex) {
-        // expected
-      }
+    	}   
     }
    
     IProject project = mavenProjectFacade.getProject();