[jbosstools-commits] JBoss Tools SVN: r31531 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf: project/capabilities and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2011-05-26 19:10:04 -0400 (Thu, 26 May 2011)
New Revision: 31531

Modified:
   trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java
   trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java
   trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java
Log:


Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java	2011-05-26 23:08:10 UTC (rev 31530)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java	2011-05-26 23:10:04 UTC (rev 31531)
@@ -15,6 +15,7 @@
 import org.eclipse.core.resources.IResource;
 import org.jboss.tools.common.model.XModelObject;
 import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+import org.jboss.tools.common.model.filesystems.impl.Libs;
 import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
 import org.jboss.tools.jst.web.tld.model.TLDUtil;
 
@@ -29,7 +30,7 @@
 		if(fss == null) return list.iterator();
 		XModelObject[] fs = fss.getChildren("FileSystemJar");
 		for (int i = 0; i < fs.length; i++) {
-			if(!fs[i].getAttributeValue("name").startsWith("lib-")) continue;
+			if(!fs[i].getAttributeValue("name").startsWith(Libs.LIB_PREFIX)) continue;
 			r = fs[i].getChildByPath("META-INF");
 			if(r != null) list.add(r);
 		}

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java	2011-05-26 23:08:10 UTC (rev 31530)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java	2011-05-26 23:10:04 UTC (rev 31531)
@@ -22,6 +22,7 @@
 import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
 import org.jboss.tools.common.model.*;
 import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+import org.jboss.tools.common.model.filesystems.impl.Libs;
 import org.jboss.tools.common.model.plugin.ModelPlugin;
 import org.jboss.tools.common.model.util.EclipseResourceUtil;
 import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -198,7 +199,7 @@
 				}
 				FileUtil.copyFile(source, target, true);
 				changed = true;
-				String fsName = "lib-" + n;
+				String fsName = Libs.LIB_PREFIX + n;
 				if(fss.getChildByPath(fsName) == null) {
 	                Properties fsProp = new Properties();
 	                fsProp.setProperty("name", fsName);

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-05-26 23:08:10 UTC (rev 31530)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java	2011-05-26 23:10:04 UTC (rev 31531)
@@ -26,6 +26,7 @@
 import org.jboss.tools.common.model.XModelObject;
 import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
 import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
+import org.jboss.tools.common.model.filesystems.impl.Libs;
 import org.jboss.tools.common.model.util.EclipseResourceUtil;
 import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
 import org.jboss.tools.common.util.FileUtil;
@@ -192,7 +193,7 @@
 		if (jars != null)
 			for (int i = 0; i < jars.length; i++) {
 				String n = jars[i].getName();
-				getOrCreateFileSystem("lib-" + n, loc + "/" + n, "hidden=yes",
+				getOrCreateFileSystem(Libs.LIB_PREFIX + n, loc + "/" + n, "hidden=yes",
 						true, true);
 			}
 	}