Author: scabanovich Date: 2008-02-18 11:21:36 -0500 (Mon, 18 Feb 2008) New Revision: 6388 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java Log: JBIDE-1670 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java 2008-02-18 16:20:30 UTC (rev 6387) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java 2008-02-18 16:21:36 UTC (rev 6388) @@ -200,6 +200,7 @@ IValueInfo value = map.get(name); Element c = XMLUtilities.createElement(element, TAG_ENTRY); c.setAttribute(ATTR_NAME, name); + if(value == null) continue; value.toXML(c, context); } } 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 2008-02-18 16:20:30 UTC (rev 6387) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2008-02-18 16:21:36 UTC (rev 6388) @@ -11,7 +11,6 @@ package org.jboss.tools.seam.internal.core.scanner.lib; import java.io.File; -import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; @@ -28,7 +27,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.jdt.core.IClasspathContainer; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; @@ -99,7 +97,7 @@ List<String> newPaths = null; try { newPaths = EclipseResourceUtil.getClassPath(project.getProject()); - List<String> jre = getJREClassPath(project.getProject()); + List<String> jre = EclipseResourceUtil.getJREClassPath(project.getProject()); if(jre != null) newPaths.removeAll(jre); } catch (Exception e) { //TODO @@ -257,40 +255,6 @@ return classLoader; } - public static List<String> getJREClassPath(IProject project) throws CoreException { - if(!project.hasNature(JavaCore.NATURE_ID)) return null; - ArrayList<String> l = new ArrayList<String>(); - IJavaProject javaProject = JavaCore.create(project); - IClasspathEntry[] es0 = javaProject.getRawClasspath(); - IClasspathEntry[] es = null; - for (int i = 0; i < es0.length && es == null; i++) { - if(es0[i].getEntryKind() == IClasspathEntry.CPE_CONTAINER && - es0[i].getPath().toString().equals("org.eclipse.jdt.launching.JRE_CONTAINER")) { //$NON-NLS-1$ - IClasspathContainer container = JavaCore.getClasspathContainer(es0[i].getPath(), javaProject); - if(container == null) continue; - es = container.getClasspathEntries(); - } - } - if(es == null) return l; - for (int i = 0; i < es.length; i++) { - try { - String s = null; - String path = es[i].getPath().toString(); - if(path.startsWith("/" + project.getName() + "/")) { //$NON-NLS-1$ //$NON-NLS-2$ - s = project.findMember(es[i].getPath().removeFirstSegments(1)).getLocation().toString(); - } else if(new java.io.File(path).isFile()) { - s = path; - } - if(s != null) { - l.add(new java.io.File(s).getCanonicalPath()); - } - } catch (IOException e) { - //ignore - we do not care about malformed URLs in class path here. - } - } - return l; - } - List<SeamProject> getSeamProjects(IProject project) throws CoreException { List<SeamProject> list = new ArrayList<SeamProject>(); IJavaProject javaProject = JavaCore.create(project);