Author: scabanovich
Date: 2011-05-26 19:11:10 -0400 (Thu, 26 May 2011)
New Revision: 31532
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java
Log:
JBIDE-9005
https://issues.jboss.org/browse/JBIDE-9005
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2011-05-26
23:10:04 UTC (rev 31531)
+++
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2011-05-26
23:11:10 UTC (rev 31532)
@@ -35,6 +35,7 @@
import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.FileSystemsImpl;
+import org.jboss.tools.common.model.filesystems.impl.Libs;
import org.jboss.tools.common.model.impl.XModelImpl;
import org.jboss.tools.common.model.util.XMLUtil;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -97,7 +98,7 @@
for (int i = 0; i < jars.length; i++) {
String jarName = jars[i].getName();
Properties fsProp = new Properties();
- fsProp.setProperty("name", "lib-"+jarName);
//$NON-NLS-1$ //$NON-NLS-2$
+ fsProp.setProperty("name", Libs.LIB_PREFIX + jarName);
//$NON-NLS-1$
fsProp.setProperty("location", libName+jarName);
//$NON-NLS-1$
fsProp.setProperty("info", "hidden=yes");
//$NON-NLS-1$ //$NON-NLS-2$
XModelObject fsJar = XModelObjectLoaderUtil.createValidObject(model,
"FileSystemJar", fsProp); //$NON-NLS-1$
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java 2011-05-26
23:10:04 UTC (rev 31531)
+++
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java 2011-05-26
23:11:10 UTC (rev 31532)
@@ -25,6 +25,7 @@
import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
import org.jboss.tools.common.model.filesystems.impl.FolderImpl;
import org.jboss.tools.common.model.filesystems.impl.JarSystemImpl;
+import org.jboss.tools.common.model.filesystems.impl.Libs;
import org.jboss.tools.common.model.impl.XModelImpl;
import org.jboss.tools.common.model.util.XModelObjectUtil;
import org.jboss.tools.jst.web.WebModelPlugin;
@@ -205,7 +206,7 @@
XModelObject[] fs = fss.getChildren("FileSystemJar"); //$NON-NLS-1$
for (int i = 0; i < fs.length; i++) {
String n = fs[i].getAttributeValue("name"); //$NON-NLS-1$
- if(n.startsWith("lib-")) findTldsInJar(fs[i]); //$NON-NLS-1$
+ if(n.startsWith(Libs.LIB_PREFIX)) findTldsInJar(fs[i]);
}
}