Attachment #180960 for bug #327429

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

Lines 156-162 Link Here

(-)src/org/eclipse/jdt/internal/compiler/apt/util/ArchiveFileObject.java (-1 / +1 lines)
156	*/	156	*/
157	public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {	157	public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
158	if (getKind() == Kind.SOURCE) {	158	if (getKind() == Kind.SOURCE) {
159	return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(this.zipEntry, this.zipFile), this.charset.toString());	159	return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(this.zipEntry, this.zipFile), this.charset.name());
160	}	160	}
161	return null;	161	return null;
162	}	162	}




		ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
		ArrayList<File> files = new ArrayList<File>();
		try {
			this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
		} catch (IllegalArgumentException e) {
			return null;
		}

		ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
		ArrayList<File> files = new ArrayList<File>();
		try {
			this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
		} catch (IllegalArgumentException e) {
			return null;
		}

		ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
		ArrayList<File> files = new ArrayList<File>();
		try {
			this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
		} catch (IllegalArgumentException e) {
			return null;
		}

Lines 133-139 Link Here

(-)src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileObject.java (-1 / +1 lines)
133	* @see javax.tools.FileObject#getCharContent(boolean)	133	* @see javax.tools.FileObject#getCharContent(boolean)
134	*/	134	*/
135	public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {	135	public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
136	return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(this.f), this.charset.toString());	136	return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(this.f), this.charset.name());
137	}	137	}
138		138
139	/* (non-Javadoc)	139	/* (non-Javadoc)

Lines 163-169 Link Here

(-)src/org/eclipse/jdt/internal/compiler/tool/ArchiveFileObject.java (-1 / +1 lines)
163	@Override	163	@Override
164	public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {	164	public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
165	if (getKind() == Kind.SOURCE) {	165	if (getKind() == Kind.SOURCE) {
166	return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(this.zipEntry, this.zipFile), this.charset.toString());	166	return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(this.zipEntry, this.zipFile), this.charset.name());
167	}	167	}
168	return null;	168	return null;
169	}	169	}




		ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
		ArrayList<File> files = new ArrayList<File>();
		try {
			this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
		} catch (IllegalArgumentException e) {
			return null;
		}

		ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
		ArrayList<File> files = new ArrayList<File>();
		try {
			this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
		} catch (IllegalArgumentException e) {
			return null;
		}

		ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
		ArrayList<File> files = new ArrayList<File>();
		try {
			this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
		} catch (IllegalArgumentException e) {
			return null;
		}

Lines 138-144 Link Here

(-)src/org/eclipse/jdt/internal/compiler/tool/EclipseFileObject.java (-1 / +1 lines)
138	*/	138	*/
139	@Override	139	@Override
140	public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {	140	public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
141	return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(this.f), this.charset.toString());	141	return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(this.f), this.charset.name());
142	}	142	}
143		143
144	/**	144	/**

Return to bug 327429

Lines 268-274 Link Here

(-)src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileManager.java (-3 / +3 lines)
268	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();	268	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
269	ArrayList<File> files = new ArrayList<File>();	269	ArrayList<File> files = new ArrayList<File>();
270	try {	270	try {
271	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false);	271	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
272	} catch (IllegalArgumentException e) {	272	} catch (IllegalArgumentException e) {
273	return null;	273	return null;
274	}	274	}
Lines 338-344 Link Here
338	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();	338	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
339	ArrayList<File> files = new ArrayList<File>();	339	ArrayList<File> files = new ArrayList<File>();
340	try {	340	try {
341	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false);	341	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
342	} catch (IllegalArgumentException e) {	342	} catch (IllegalArgumentException e) {
343	return null;	343	return null;
344	}	344	}
Lines 352-358 Link Here
352	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();	352	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
353	ArrayList<File> files = new ArrayList<File>();	353	ArrayList<File> files = new ArrayList<File>();
354	try {	354	try {
355	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false);	355	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
356	} catch (IllegalArgumentException e) {	356	} catch (IllegalArgumentException e) {
357	return null;	357	return null;
358	}	358	}

Lines 271-277 Link Here

(-)src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java (-3 / +3 lines)
271	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();	271	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
272	ArrayList<File> files = new ArrayList<File>();	272	ArrayList<File> files = new ArrayList<File>();
273	try {	273	try {
274	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false);	274	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
275	} catch (IllegalArgumentException e) {	275	} catch (IllegalArgumentException e) {
276	return null;	276	return null;
277	}	277	}
Lines 341-347 Link Here
341	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();	341	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
342	ArrayList<File> files = new ArrayList<File>();	342	ArrayList<File> files = new ArrayList<File>();
343	try {	343	try {
344	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false);	344	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
345	} catch (IllegalArgumentException e) {	345	} catch (IllegalArgumentException e) {
346	return null;	346	return null;
347	}	347	}
Lines 355-361 Link Here
355	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();	355	ArrayList<FileSystem.Classpath> paths = new ArrayList<FileSystem.Classpath>();
356	ArrayList<File> files = new ArrayList<File>();	356	ArrayList<File> files = new ArrayList<File>();
357	try {	357	try {
358	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false);	358	this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false);
359	} catch (IllegalArgumentException e) {	359	} catch (IllegalArgumentException e) {
360	return null;	360	return null;
361	}	361	}