Attachment #193981 for bug #90486

Lines 344-350 Link Here

(-)model/org/eclipse/jdt/internal/core/JavaModelStatus.java (-1 / +1 lines)
344		344
345	case CLASSPATH_CYCLE:	345	case CLASSPATH_CYCLE:
346	javaProject = (IJavaProject)this.elements[0];	346	javaProject = (IJavaProject)this.elements[0];
347	return Messages.bind(Messages.classpath_cycle, javaProject.getElementName());	347	return Messages.bind(Messages.classpath_cycle, new String[] {javaProject.getElementName(), this.string});
348		348
349	case DISABLED_CP_EXCLUSION_PATTERNS:	349	case DISABLED_CP_EXCLUSION_PATTERNS:
350	javaProject = (IJavaProject)this.elements[0];	350	javaProject = (IJavaProject)this.elements[0];




							throw new JavaModelException(e);
						}
					} else {
						IJavaProject[] projectsInCycle;
						String cycleString = "";	 //$NON-NLS-1$
						if (cycleParticipants.isEmpty()) {
							projectsInCycle = null;
						} else {
							projectsInCycle = new IJavaProject[cycleParticipants.size()];
							Iterator it = cycleParticipants.iterator();
							int k = 0;
							while (it.hasNext()) {
								//projectsInCycle[i++] = (IPath) it.next();
								IResource member = workspaceRoot.findMember((IPath) it.next());
								if (member != null && member.getType() == IResource.PROJECT){
									projectsInCycle[k] = JavaCore.create((IProject)member);
									if (projectsInCycle[k] != null) {
										if (k != 0) cycleString += ", "; //$NON-NLS-1$
										cycleString += projectsInCycle[k++].getElementName();
									}
								}
							}
						}
						// create new marker
						project.createClasspathProblemMarker(
							new JavaModelStatus(IJavaModelStatusConstants.CLASSPATH_CYCLE, project, cycleString));
					}
				} else {
					project.flushClasspathProblemMarkers(true, false);

Lines 141-147 Link Here

(-)model/org/eclipse/jdt/internal/core/util/messages.properties (-1 / +1 lines)
141	classpath_cannotUseLibraryAsOutput = Source folder ''{0}'' in project ''{2}'' cannot output to library ''{1}''	141	classpath_cannotUseLibraryAsOutput = Source folder ''{0}'' in project ''{2}'' cannot output to library ''{1}''
142	classpath_closedProject = Required project ''{0}'' needs to be open	142	classpath_closedProject = Required project ''{0}'' needs to be open
143	classpath_couldNotWriteClasspathFile = Could not write ''.classpath'' file of project ''{0}'': {1}	143	classpath_couldNotWriteClasspathFile = Could not write ''.classpath'' file of project ''{0}'': {1}
144	classpath_cycle = A cycle was detected in the build path of project ''{0}''	144	classpath_cycle = A cycle was detected in the build path of project ''{0}''. The cycle consists of projects '{'{1}'}'
145	classpath_duplicateEntryPath = Build path contains duplicate entry: ''{0}'' for project ''{1}''	145	classpath_duplicateEntryPath = Build path contains duplicate entry: ''{0}'' for project ''{1}''
146	classpath_illegalContainerPath = Illegal classpath container path: ''{0}'' in project ''{1}'', must have at least one segment (containerID+hints)	146	classpath_illegalContainerPath = Illegal classpath container path: ''{0}'' in project ''{1}'', must have at least one segment (containerID+hints)
147	classpath_illegalEntryInClasspathFile = Illegal entry in ''.classpath'' of project ''{0}'' file: {1}	147	classpath_illegalEntryInClasspathFile = Illegal entry in ''.classpath'' of project ''{0}'' file: {1}

Return to bug 90486

Lines 406-414 Link Here

(-)model/org/eclipse/jdt/internal/core/JavaProject.java (-1 / +21 lines)
406	throw new JavaModelException(e);	406	throw new JavaModelException(e);
407	}	407	}
408	} else {	408	} else {
		409	IJavaProject[] projectsInCycle;
		410	String cycleString = ""; //$NON-NLS-1$
		411	if (cycleParticipants.isEmpty()) {
		412	projectsInCycle = null;
		413	} else {
		414	projectsInCycle = new IJavaProject[cycleParticipants.size()];
		415	Iterator it = cycleParticipants.iterator();
		416	int k = 0;
		417	while (it.hasNext()) {
		418	//projectsInCycle[i++] = (IPath) it.next();
		419	IResource member = workspaceRoot.findMember((IPath) it.next());
		420	if (member != null && member.getType() == IResource.PROJECT){
		421	projectsInCycle[k] = JavaCore.create((IProject)member);
		422	if (projectsInCycle[k] != null) {
		423	if (k != 0) cycleString += ", "; //$NON-NLS-1$
		424	cycleString += projectsInCycle[k++].getElementName();
		425	}
		426	}
		427	}
		428	}
409	// create new marker	429	// create new marker
410	project.createClasspathProblemMarker(	430	project.createClasspathProblemMarker(
411	new JavaModelStatus(IJavaModelStatusConstants.CLASSPATH_CYCLE, project));	431	new JavaModelStatus(IJavaModelStatusConstants.CLASSPATH_CYCLE, project, cycleString));
412	}	432	}
413	} else {	433	} else {
414	project.flushClasspathProblemMarkers(true, false);	434	project.flushClasspathProblemMarkers(true, false);