Author: scabanovich Date: 2012-01-10 17:08:44 -0500 (Tue, 10 Jan 2012) New Revision: 37748 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java Log: JBIDE-9420 https://issues.joss.org/browse/JBIDE-9420 Load taglibs from external class folders. 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 2012-01-10 18:59:00 UTC (rev 37747) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java 2012-01-10 22:08:44 UTC (rev 37748) @@ -16,7 +16,6 @@ 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.jsf.JSFModelPlugin; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; import org.jboss.tools.jst.web.tld.model.TLDUtil; @@ -25,11 +24,11 @@ protected Iterator<XModelObject> getRoots() { List<XModelObject> list = new ArrayList<XModelObject>(); - XModelObject r = getModel().getByPath("FileSystems/WEB-INF"); + XModelObject r = FileSystemsHelper.getWebInf(getModel()); if(r != null) list.add(r); - XModelObject fss = getModel().getByPath("FileSystems"); + XModelObject fss = FileSystemsHelper.getFileSystems(getModel()); if(fss == null) return list.iterator(); - XModelObject[] fs = fss.getChildren("FileSystemJar"); + XModelObject[] fs = fss.getChildren(); for (int i = 0; i < fs.length; i++) { if(!fs[i].getAttributeValue("name").startsWith(Libs.LIB_PREFIX)) continue; r = fs[i].getChildByPath("META-INF"); @@ -107,7 +106,7 @@ public Object getAdapter(Class adapter) { if(adapter == IResource.class) { - XModelObject o = getModel().getByPath("FileSystems/WEB-INF"); + XModelObject o = FileSystemsHelper.getWebInf(getModel()); return (o != null) ? o.getAdapter(adapter) : null; } return super.getAdapter(adapter);