Author: scabanovich
Date: 2009-02-09 10:26:52 -0500 (Mon, 09 Feb 2009)
New Revision: 13548
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
Log:
JBIDE-3729
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2009-02-09
15:26:04 UTC (rev 13547)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2009-02-09
15:26:52 UTC (rev 13548)
@@ -36,6 +36,7 @@
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.xml.XMLUtilities;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamComponentDeclaration;
@@ -327,7 +328,7 @@
IPath[] ps = sourcePaths2.keySet().toArray(new IPath[0]);
for (int i = 0; i < ps.length; i++) {
IPath pth = ps[i];
- if(p.getSourcePath().isPrefixOf(pth) || (p.isPathLoaded(pth) &&
!pth.toString().endsWith(".jar"))) {
+ if(p.getSourcePath().isPrefixOf(pth) || (p.isPathLoaded(pth) &&
!EclipseResourceUtil.isJar(pth.toString()))) {
pathRemoved(pth);
}
}
@@ -776,7 +777,7 @@
if(ns.length == 0 && components.length == 0 && factories.length == 0
&& ds.getImports().size() == 0) {
pathRemoved(source);
- if(source.toString().endsWith(".jar")) {
+ if(EclipseResourceUtil.isJar(source.toString())) {
if(!sourcePaths.contains(source)) sourcePaths.add(source);
sourcePaths2.put(source, ds);
}
@@ -945,7 +946,7 @@
*/
public void registerComponentsInDependentProjects(LoadedDeclarations ds, IPath source)
throws CloneNotSupportedException {
if(usedBy.size() == 0) return;
- if(source.toString().endsWith(".jar")) return; //$NON-NLS-1$
+ if(EclipseResourceUtil.isJar(source.toString())) return;
for (SeamProject p : usedBy) {
p.resolve();
@@ -1060,7 +1061,7 @@
public void firePathRemovedToDependentProjects(IPath source) {
if(usedBy.size() == 0) return;
- if(source.toString().endsWith(".jar")) return; //$NON-NLS-1$
+ if(EclipseResourceUtil.isJar(source.toString())) return;
for (SeamProject p : usedBy) {
p.resolve();
@@ -1576,7 +1577,7 @@
for (ISeamComponent c : components.allComponentsSet) {
for (ISeamComponentDeclaration d : c.getAllDeclarations()) {
IPath p = d.getSourcePath();
- if(p == null || p.toString().endsWith(".jar")) continue; //$NON-NLS-1$
+ if(p == null || EclipseResourceUtil.isJar(p.toString())) continue;
LoadedDeclarations ds = map.get(p);
if(ds == null) {
ds = new LoadedDeclarations();
@@ -1589,7 +1590,7 @@
Set<ISeamNamespace> s = namespaces.namespacesByURI.get(uri);
for (ISeamNamespace n : s) {
IPath p = n.getSourcePath();
- if(p == null || p.toString().endsWith(".jar")) continue; //$NON-NLS-1$
+ if(p == null || EclipseResourceUtil.isJar(p.toString())) continue;
LoadedDeclarations ds = map.get(p);
if(ds == null) {
ds = new LoadedDeclarations();
@@ -1600,7 +1601,7 @@
}
for (ISeamFactory f : factories.allFactories) {
IPath p = f.getSourcePath();
- if(p == null || p.toString().endsWith(".jar")) continue; //$NON-NLS-1$
+ if(p == null || EclipseResourceUtil.isJar(p.toString())) continue;
LoadedDeclarations ds = map.get(p);
if(ds == null) {
ds = new LoadedDeclarations();
@@ -1610,7 +1611,7 @@
}
for (String s: imports.keySet()) {
IPath p = new Path(s);
- if(p == null || p.toString().endsWith(".jar")) continue; //$NON-NLS-1$
+ if(p == null || EclipseResourceUtil.isJar(p.toString())) continue;
LoadedDeclarations ds = map.get(p);
if(ds == null) {
ds = new LoadedDeclarations();
@@ -2083,5 +2084,5 @@
return byPath.get(p);
}
}
-
+
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2009-02-09
15:26:04 UTC (rev 13547)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2009-02-09
15:26:52 UTC (rev 13548)
@@ -120,7 +120,7 @@
for (int i = 0; i < paths.size(); i++) {
String path = paths.get(i);
- if(!path.endsWith(".jar")) continue; //$NON-NLS-1$
+ if(!EclipseResourceUtil.isJar(path)) continue;
String fileName = new File(path).getName();
if(SYSTEM_JAR_SET.contains(fileName)) continue;
String jsname = "lib-" + fileName; //$NON-NLS-1$
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java 2009-02-09
15:26:04 UTC (rev 13547)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java 2009-02-09
15:26:52 UTC (rev 13548)
@@ -59,7 +59,7 @@
}
public boolean isRelevant(IFile f) {
- if(f.getName().endsWith(".jar")) return true; //$NON-NLS-1$
+ if(EclipseResourceUtil.isJar(f.getName())) return true;
return false;
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2009-02-09
15:26:04 UTC (rev 13547)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2009-02-09
15:26:52 UTC (rev 13548)
@@ -314,7 +314,7 @@
}
public static String getImpliedClassName(XModelObject c, IPath path) {
- if(path.toString().endsWith(".jar")) { //$NON-NLS-1$
+ if(EclipseResourceUtil.isJar(path.toString())) {
String suffix = ".component"; //$NON-NLS-1$
String cn = c.getAttributeValue("name"); //$NON-NLS-1$
if(cn.endsWith(suffix)) cn = cn.substring(0, cn.length() - suffix.length());
Show replies by date