[jbosstools-commits] JBoss Tools SVN: r30977 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf: web/helpers/context and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2011-04-29 14:04:51 -0400 (Fri, 29 Apr 2011)
New Revision: 30977

Modified:
   trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/JSF2Util.java
   trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java
Log:
JBIDE-8620
https://issues.jboss.org/browse/JBIDE-8620

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/JSF2Util.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/JSF2Util.java	2011-04-29 17:37:43 UTC (rev 30976)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/JSF2Util.java	2011-04-29 18:04:51 UTC (rev 30977)
@@ -95,16 +95,12 @@
 		IPackageFragmentRoot library = findLibrary(project, jarName);
 		if(library instanceof JarPackageFragmentRoot) {
 			ZipFile zip = ((JarPackageFragmentRoot)library).getJar();
-			try {
-				ZipEntry entry = zip.getEntry("META-INF/MANIFEST.MF");
-				if(entry != null) {
-					InputStream is = zip.getInputStream(entry);
-					if(is != null) {
-						return FileUtil.readStream(is);
-					}
+			ZipEntry entry = zip.getEntry("META-INF/MANIFEST.MF");
+			if(entry != null) {
+				InputStream is = zip.getInputStream(entry);
+				if(is != null) {
+					return FileUtil.readStream(is);
 				}
-			} finally {
-				zip.close();
 			}
 		}
 		return null;

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java	2011-04-29 17:37:43 UTC (rev 30976)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java	2011-04-29 18:04:51 UTC (rev 30977)
@@ -239,9 +239,10 @@
 
     void modifyWebXML() throws XModelException {
 		IProject project = EclipseResourceUtil.getProject(model.getRoot());
-		boolean isJSF2 = isJSF2a();
-		if(!isJSF2) try {
-			isJSF2 = JSF2Util.isJSF2FacetedProject(project);
+		boolean isJSF2 = false;
+		try {
+			isJSF2 = JSF2Util.isJSF2(project);
+			if(!isJSF2) isJSF2 = isJSF2a();
 		} catch (CoreException e) {
 			JSFModelPlugin.getPluginLog().logError(e);
 			return;