Author: scabanovich
Date: 2009-02-09 10:26:04 -0500 (Mon, 09 Feb 2009)
New Revision: 13547
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-3729
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2009-02-09
15:17:02 UTC (rev 13546)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2009-02-09
15:26:04 UTC (rev 13547)
@@ -191,7 +191,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/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2009-02-09
15:17:02 UTC (rev 13546)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2009-02-09
15:26:04 UTC (rev 13547)
@@ -67,7 +67,9 @@
try {
int ind = location.indexOf(":/");
if (ind != 1 && ind != -1) {
- File f = File.createTempFile("efs_", ".jar");
+ int extI = location.lastIndexOf('.');
+ String ext = extI >= 0 ? location.substring(extI) : ".jar";
+ File f = File.createTempFile("efs_", ext);
f.deleteOnExit();
InputStream i = new java.net.URL(location).openConnection().getInputStream();
FileOutputStream o = new FileOutputStream(f);
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2009-02-09
15:17:02 UTC (rev 13546)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2009-02-09
15:26:04 UTC (rev 13547)
@@ -110,7 +110,7 @@
}
fs = fso.getChildren("FileSystemJar");
String location = path == null ? null : path.toString().replace('\\',
'/');
- if(location != null && location.toLowerCase().endsWith(".jar")) {
+ if(location != null && isJar(location)) {
for (int i = 0; i < fs.length; i++) {
JarSystemImpl jar = (JarSystemImpl)fs[i];
String jl = jar.getLocation();
@@ -356,7 +356,7 @@
}
private static boolean isJar(IResource resource) {
- return (resource instanceof IFile &&
resource.getName().endsWith(".jar"));
+ return (resource instanceof IFile && isJar(resource.getName()));
}
private static void validateJarSystem(XModelObject fs, IResource resource) {
@@ -899,4 +899,10 @@
return null;
}
+ public static boolean isJar(String path) {
+ if(path == null) return false;
+ path = path.toLowerCase();
+ return path.endsWith(".jar") || path.endsWith(".zip");
+ }
+
}
Show replies by date