Author: bfitzpat Date: 2012-02-14 14:36:11 -0500 (Tue, 14 Feb 2012) New Revision: 38725 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java Log: [JBIDE-10902] Fixing issue Xavier found with the sample WS creation wizards Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2012-02-14 18:46:45 UTC (rev 38724) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2012-02-14 19:36:11 UTC (rev 38725) @@ -418,6 +418,9 @@ throws JavaModelException { IJavaProject javaProject = JavaCore.create(project); IResource[] rs = getJavaSourceRoots(javaProject); + if (rs == null || rs.length == 0) { + rs = getJavaSourceRoots(javaProject, false); + } String src = ""; //$NON-NLS-1$ if (rs == null || rs.length == 0) return src; @@ -447,7 +450,11 @@ return null; } - public static IResource[] getJavaSourceRoots(IJavaProject javaProject) + public static IResource[] getJavaSourceRoots(IJavaProject javaProject) throws JavaModelException { + return getJavaSourceRoots(javaProject, true); + } + + public static IResource[] getJavaSourceRoots(IJavaProject javaProject, boolean outputLocationIsNull) throws JavaModelException { if (javaProject == null) return null; @@ -460,8 +467,10 @@ .findMember(es[i].getPath()); if (findMember != null && findMember.exists()) { // JBIDE-8642: if the output location is null, this is the default source path - if (outputLocation == null) { + if (outputLocationIsNull && outputLocation == null) { resources.add(findMember); + } else { + resources.add(findMember); } } }