Attachment #195797 for bug #346010

Lines 5054-5062 Link Here

(-)model/org/eclipse/jdt/internal/core/JavaModelManager.java (-3 / +6 lines)
5054	}	5054	}
5055	return result;	5055	return result;
5056	}	5056	}
5057		5057	static int count = 0;
5058	public synchronized void variablePut(String variableName, IPath variablePath){	5058	public synchronized void variablePut(String variableName, IPath variablePath){
5059		5059	System.out.println("variablePut ("+variableName+","+variablePath+") #"+(++count));
5060	// set/unset the initialization in progress	5060	// set/unset the initialization in progress
5061	HashSet initializations = variableInitializationInProgress();	5061	HashSet initializations = variableInitializationInProgress();
5062	if (variablePath == VARIABLE_INITIALIZATION_IN_PROGRESS) {	5062	if (variablePath == VARIABLE_INITIALIZATION_IN_PROGRESS) {
Lines 5076-5082 Link Here
5076	this.variablesWithInitializer.remove(variableName);	5076	this.variablesWithInitializer.remove(variableName);
5077	this.deprecatedVariables.remove(variableName);	5077	this.deprecatedVariables.remove(variableName);
5078	} else {	5078	} else {
5079	this.variables.put(variableName, variablePath);	5079	if (count != 1)
		5080	this.variables.put(variableName, variablePath);
		5081	else
		5082	System.out.println("DISCARD this.variables.put("+variableName+", "+variablePath+")");
5080	}	5083	}
5081	// discard obsoleted information about previous session	5084	// discard obsoleted information about previous session
5082	this.previousSessionVariables.remove(variableName);	5085	this.previousSessionVariables.remove(variableName);




		this.variablePaths = variablePaths;
		this.updatePreferences = updatePreferences;
	}
	static int count = 0;
	protected void executeOperation() throws JavaModelException {
		checkCanceled();
		try {

			// update variables
			for (int i = 0; i < varLength; i++){
				manager.variablePut(this.variableNames[i], this.variablePaths[i]);
				if (count != 0) {
					if (this.updatePreferences) {
						System.out.println("manager.variablePreferencesPut("+this.variableNames[i]+","+this.variablePaths[i]+")");
						manager.variablePreferencesPut(this.variableNames[i], this.variablePaths[i]);
					}
				} else {
					System.out.println("DISCARD manager.variablePreferencesPut("+this.variableNames[i]+","+this.variablePaths[i]+")");
				}
				count++;
			}

			// update affected project classpaths

Return to bug 346010

Lines 38-44 Link Here

(-)model/org/eclipse/jdt/internal/core/SetVariablesOperation.java (-3 / +10 lines)
38	this.variablePaths = variablePaths;	38	this.variablePaths = variablePaths;
39	this.updatePreferences = updatePreferences;	39	this.updatePreferences = updatePreferences;
40	}	40	}
41		41	static int count = 0;
42	protected void executeOperation() throws JavaModelException {	42	protected void executeOperation() throws JavaModelException {
43	checkCanceled();	43	checkCanceled();
44	try {	44	try {
Lines 122-129 Link Here
122	// update variables	122	// update variables
123	for (int i = 0; i < varLength; i++){	123	for (int i = 0; i < varLength; i++){
124	manager.variablePut(this.variableNames[i], this.variablePaths[i]);	124	manager.variablePut(this.variableNames[i], this.variablePaths[i]);
125	if (this.updatePreferences)	125	if (count != 0) {
126	manager.variablePreferencesPut(this.variableNames[i], this.variablePaths[i]);	126	if (this.updatePreferences) {
		127	System.out.println("manager.variablePreferencesPut("+this.variableNames[i]+","+this.variablePaths[i]+")");
		128	manager.variablePreferencesPut(this.variableNames[i], this.variablePaths[i]);
		129	}
		130	} else {
		131	System.out.println("DISCARD manager.variablePreferencesPut("+this.variableNames[i]+","+this.variablePaths[i]+")");
		132	}
		133	count++;
127	}	134	}
128		135
129	// update affected project classpaths	136	// update affected project classpaths