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

(-)batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java (+3 lines)
Lines 185-188 Link Here
185
public String getPath() {
185
public String getPath() {
186
	return this.path;
186
	return this.path;
187
}
187
}
188
public int getMode() {
189
	return this.mode;
190
}
188
}
191
}
(-)batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java (-1 / +4 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
2
 * Copyright (c) 2000, 2010 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 202-205 Link Here
202
	}
202
	}
203
	return this.path;
203
	return this.path;
204
}
204
}
205
public int getMode() {
206
	return BINARY;
207
}
205
}
208
}
(-)batch/org/eclipse/jdt/internal/compiler/batch/ClasspathLocation.java (-1 / +34 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2008 IBM Corporation and others.
2
 * Copyright (c) 2000, 2010 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 67-70 Link Here
67
		}
67
		}
68
		return this.accessRuleSet.getViolatedRestriction(qualifiedTypeName);
68
		return this.accessRuleSet.getViolatedRestriction(qualifiedTypeName);
69
	}
69
	}
70
	
71
	public int getMode() {
72
		return SOURCE | BINARY;
73
	}
74
	public int hashCode() {
75
		final int prime = 31;
76
		int result = 1;
77
		result = prime * result + this.getMode();
78
		result = prime * result + ((this.path == null) ? 0 : this.path.hashCode());
79
		return result;
80
	}
81
	public boolean equals(Object obj) {
82
		if (this == obj)
83
			return true;
84
		if (obj == null)
85
			return false;
86
		if (getClass() != obj.getClass())
87
			return false;
88
		ClasspathLocation other = (ClasspathLocation) obj;
89
		String localPath = this.getPath();
90
		String otherPath = other.getPath();
91
		if (localPath == null) {
92
			if (otherPath != null)
93
				return false;
94
		} else if (!localPath.equals(otherPath))
95
			return false;
96
		if (this.getMode() != other.getMode())
97
			return false;
98
		return true;
99
	}
100
	public String getPath() {
101
		return this.path;
102
	}
70
}
103
}
(-)batch/org/eclipse/jdt/internal/compiler/batch/ClasspathSourceJar.java (-1 / +4 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2006, 2009 IBM Corporation and others.
2
 * Copyright (c) 2006, 2010 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 61-64 Link Here
61
	public NameEnvironmentAnswer findClass(char[] typeName, String qualifiedPackageName, String qualifiedBinaryFileName) {
61
	public NameEnvironmentAnswer findClass(char[] typeName, String qualifiedPackageName, String qualifiedBinaryFileName) {
62
		return findClass(typeName, qualifiedPackageName, qualifiedBinaryFileName, false);
62
		return findClass(typeName, qualifiedPackageName, qualifiedBinaryFileName, false);
63
	}
63
	}
64
	public int getMode() {
65
		return SOURCE;
66
	}
64
}
67
}
(-)batch/org/eclipse/jdt/internal/compiler/batch/FileSystem.java (-3 / +2 lines)
Lines 91-100 Link Here
91
			HashSet cache = new HashSet();
91
			HashSet cache = new HashSet();
92
			for (Iterator iterator = classpaths.iterator(); iterator.hasNext(); ) {
92
			for (Iterator iterator = classpaths.iterator(); iterator.hasNext(); ) {
93
				FileSystem.Classpath classpath = (FileSystem.Classpath) iterator.next();
93
				FileSystem.Classpath classpath = (FileSystem.Classpath) iterator.next();
94
				String path = classpath.getPath();
94
				if (!cache.contains(classpath)) {
95
				if (!cache.contains(path)) {
96
					normalizedClasspath.add(classpath);
95
					normalizedClasspath.add(classpath);
97
					cache.add(path);
96
					cache.add(classpath);
98
				}
97
				}
99
			}
98
			}
100
			return normalizedClasspath;
99
			return normalizedClasspath;

Return to bug 329344