### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: model/org/eclipse/jdt/internal/core/ClasspathEntry.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java,v retrieving revision 1.83 diff -u -r1.83 ClasspathEntry.java --- model/org/eclipse/jdt/internal/core/ClasspathEntry.java 5 Sep 2005 11:39:01 -0000 1.83 +++ model/org/eclipse/jdt/internal/core/ClasspathEntry.java 4 Jan 2006 12:04:19 -0000 @@ -1419,7 +1419,11 @@ } else { if (otherKind == IClasspathEntry.CPE_SOURCE) { exclusionPattern += '/'; - return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Messages.bind(Messages.classpath_cannotNestEntryInEntry, new String[] {entryPath.makeRelative().toString(), otherEntry.getPath().makeRelative().toString(), exclusionPattern})); + if (!disableExclusionPatterns) { + return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Messages.bind(Messages.classpath_cannotNestEntryInEntry, new String[] {entryPath.makeRelative().toString(), otherEntry.getPath().makeRelative().toString(), exclusionPattern})); + } else { + return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Messages.bind(Messages.classpath_cannotNestEntryInEntryNoExclusion, new String[] {entryPath.makeRelative().toString(), otherEntry.getPath().makeRelative().toString()})); + } } else { return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Messages.bind(Messages.classpath_cannotNestEntryInLibrary, new String[] {entryPath.makeRelative().toString(), otherEntry.getPath().makeRelative().toString()})); } Index: model/org/eclipse/jdt/internal/core/util/messages.properties =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties,v retrieving revision 1.49 diff -u -r1.49 messages.properties --- model/org/eclipse/jdt/internal/core/util/messages.properties 5 Dec 2005 15:33:53 -0000 1.49 +++ model/org/eclipse/jdt/internal/core/util/messages.properties 4 Jan 2006 12:04:19 -0000 @@ -130,6 +130,7 @@ ### classpath classpath_buildPath = Build path classpath_cannotNestEntryInEntry = Cannot nest ''{0}'' inside ''{1}''. To enable the nesting exclude ''{2}'' from ''{1}'' +classpath_cannotNestEntryInEntryNoExclusion= Cannot nest ''{0}'' inside ''{1}''. classpath_cannotNestEntryInLibrary = Cannot nest ''{0}'' inside library ''{1}'' classpath_cannotNestEntryInOutput = Cannot nest ''{0}'' inside output folder ''{1}'' classpath_cannotNestOutputInEntry = Cannot nest output folder ''{0}'' inside ''{1}'' Index: model/org/eclipse/jdt/internal/core/util/Messages.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Messages.java,v retrieving revision 1.8 diff -u -r1.8 Messages.java --- model/org/eclipse/jdt/internal/core/util/Messages.java 5 Dec 2005 15:33:53 -0000 1.8 +++ model/org/eclipse/jdt/internal/core/util/Messages.java 4 Jan 2006 12:04:19 -0000 @@ -124,6 +124,7 @@ public static String status_updateConflict; public static String classpath_buildPath; public static String classpath_cannotNestEntryInEntry; + public static String classpath_cannotNestEntryInEntryNoExclusion; public static String classpath_cannotNestEntryInLibrary; public static String classpath_cannotNestEntryInOutput; public static String classpath_cannotNestOutputInEntry;