Attachment #32459 for bug #122615

View | Details | Raw Unified | Return to bug 122615
Collapse All | Expand All

Lines 1419-1425 Link Here

(-)model/org/eclipse/jdt/internal/core/ClasspathEntry.java (-1 / +5 lines)
1419	} else {	1419	} else {
1420	if (otherKind == IClasspathEntry.CPE_SOURCE) {	1420	if (otherKind == IClasspathEntry.CPE_SOURCE) {
1421	exclusionPattern += '/';	1421	exclusionPattern += '/';
1422	return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Messages.bind(Messages.classpath_cannotNestEntryInEntry, new String[] {entryPath.makeRelative().toString(), otherEntry.getPath().makeRelative().toString(), exclusionPattern}));	1422	if (!disableExclusionPatterns) {
		1423	return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Messages.bind(Messages.classpath_cannotNestEntryInEntry, new String[] {entryPath.makeRelative().toString(), otherEntry.getPath().makeRelative().toString(), exclusionPattern}));
		1424	} else {
		1425	return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Messages.bind(Messages.classpath_cannotNestEntryInEntryNoExclusion, new String[] {entryPath.makeRelative().toString(), otherEntry.getPath().makeRelative().toString()}));
		1426	}
1423	} else {	1427	} else {
1424	return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Messages.bind(Messages.classpath_cannotNestEntryInLibrary, new String[] {entryPath.makeRelative().toString(), otherEntry.getPath().makeRelative().toString()}));	1428	return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Messages.bind(Messages.classpath_cannotNestEntryInLibrary, new String[] {entryPath.makeRelative().toString(), otherEntry.getPath().makeRelative().toString()}));
1425	}	1429	}

Lines 130-135 Link Here

(-)model/org/eclipse/jdt/internal/core/util/messages.properties (+1 lines)
130	### classpath	130	### classpath
131	classpath_buildPath = Build path	131	classpath_buildPath = Build path
132	classpath_cannotNestEntryInEntry = Cannot nest ''{0}'' inside ''{1}''. To enable the nesting exclude ''{2}'' from ''{1}''	132	classpath_cannotNestEntryInEntry = Cannot nest ''{0}'' inside ''{1}''. To enable the nesting exclude ''{2}'' from ''{1}''
		133	classpath_cannotNestEntryInEntryNoExclusion= Cannot nest ''{0}'' inside ''{1}''.
133	classpath_cannotNestEntryInLibrary = Cannot nest ''{0}'' inside library ''{1}''	134	classpath_cannotNestEntryInLibrary = Cannot nest ''{0}'' inside library ''{1}''
134	classpath_cannotNestEntryInOutput = Cannot nest ''{0}'' inside output folder ''{1}''	135	classpath_cannotNestEntryInOutput = Cannot nest ''{0}'' inside output folder ''{1}''
135	classpath_cannotNestOutputInEntry = Cannot nest output folder ''{0}'' inside ''{1}''	136	classpath_cannotNestOutputInEntry = Cannot nest output folder ''{0}'' inside ''{1}''

Lines 124-129 Link Here

(-)model/org/eclipse/jdt/internal/core/util/Messages.java (+1 lines)
124	public static String status_updateConflict;	124	public static String status_updateConflict;
125	public static String classpath_buildPath;	125	public static String classpath_buildPath;
126	public static String classpath_cannotNestEntryInEntry;	126	public static String classpath_cannotNestEntryInEntry;
		127	public static String classpath_cannotNestEntryInEntryNoExclusion;
127	public static String classpath_cannotNestEntryInLibrary;	128	public static String classpath_cannotNestEntryInLibrary;
128	public static String classpath_cannotNestEntryInOutput;	129	public static String classpath_cannotNestEntryInOutput;
129	public static String classpath_cannotNestOutputInEntry;	130	public static String classpath_cannotNestOutputInEntry;

Return to bug 122615