### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.compiler.apt Index: src/org/eclipse/jdt/internal/compiler/apt/util/ArchiveFileObject.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/ArchiveFileObject.java,v retrieving revision 1.2 diff -u -r1.2 ArchiveFileObject.java --- src/org/eclipse/jdt/internal/compiler/apt/util/ArchiveFileObject.java 13 Mar 2007 04:25:53 -0000 1.2 +++ src/org/eclipse/jdt/internal/compiler/apt/util/ArchiveFileObject.java 15 Oct 2010 14:13:55 -0000 @@ -156,7 +156,7 @@ */ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { if (getKind() == Kind.SOURCE) { - return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(this.zipEntry, this.zipFile), this.charset.toString()); + return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(this.zipEntry, this.zipFile), this.charset.name()); } return null; } Index: src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileManager.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileManager.java,v retrieving revision 1.10 diff -u -r1.10 EclipseFileManager.java --- src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileManager.java 11 May 2010 18:49:23 -0000 1.10 +++ src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileManager.java 15 Oct 2010 14:13:55 -0000 @@ -268,7 +268,7 @@ ArrayList paths = new ArrayList(); ArrayList files = new ArrayList(); try { - this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false); + this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false); } catch (IllegalArgumentException e) { return null; } @@ -338,7 +338,7 @@ ArrayList paths = new ArrayList(); ArrayList files = new ArrayList(); try { - this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false); + this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false); } catch (IllegalArgumentException e) { return null; } @@ -352,7 +352,7 @@ ArrayList paths = new ArrayList(); ArrayList files = new ArrayList(); try { - this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false); + this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false); } catch (IllegalArgumentException e) { return null; } Index: src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileObject.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileObject.java,v retrieving revision 1.1 diff -u -r1.1 EclipseFileObject.java --- src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileObject.java 23 Feb 2007 00:50:41 -0000 1.1 +++ src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileObject.java 15 Oct 2010 14:13:55 -0000 @@ -133,7 +133,7 @@ * @see javax.tools.FileObject#getCharContent(boolean) */ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { - return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(this.f), this.charset.toString()); + return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(this.f), this.charset.name()); } /* (non-Javadoc) #P org.eclipse.jdt.compiler.tool Index: src/org/eclipse/jdt/internal/compiler/tool/ArchiveFileObject.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/ArchiveFileObject.java,v retrieving revision 1.4 diff -u -r1.4 ArchiveFileObject.java --- src/org/eclipse/jdt/internal/compiler/tool/ArchiveFileObject.java 9 Oct 2009 13:01:17 -0000 1.4 +++ src/org/eclipse/jdt/internal/compiler/tool/ArchiveFileObject.java 15 Oct 2010 14:13:55 -0000 @@ -163,7 +163,7 @@ @Override public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { if (getKind() == Kind.SOURCE) { - return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(this.zipEntry, this.zipFile), this.charset.toString()); + return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(this.zipEntry, this.zipFile), this.charset.name()); } return null; } Index: src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java,v retrieving revision 1.14 diff -u -r1.14 EclipseFileManager.java --- src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java 11 May 2010 18:48:01 -0000 1.14 +++ src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java 15 Oct 2010 14:13:55 -0000 @@ -271,7 +271,7 @@ ArrayList paths = new ArrayList(); ArrayList files = new ArrayList(); try { - this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false); + this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false); } catch (IllegalArgumentException e) { return null; } @@ -341,7 +341,7 @@ ArrayList paths = new ArrayList(); ArrayList files = new ArrayList(); try { - this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false); + this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false); } catch (IllegalArgumentException e) { return null; } @@ -355,7 +355,7 @@ ArrayList paths = new ArrayList(); ArrayList files = new ArrayList(); try { - this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.toString(), false, false); + this.processPathEntries(Main.DEFAULT_SIZE_CLASSPATH, paths, path, this.charset.name(), false, false); } catch (IllegalArgumentException e) { return null; } Index: src/org/eclipse/jdt/internal/compiler/tool/EclipseFileObject.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileObject.java,v retrieving revision 1.6 diff -u -r1.6 EclipseFileObject.java --- src/org/eclipse/jdt/internal/compiler/tool/EclipseFileObject.java 28 Apr 2009 16:36:50 -0000 1.6 +++ src/org/eclipse/jdt/internal/compiler/tool/EclipseFileObject.java 15 Oct 2010 14:13:55 -0000 @@ -138,7 +138,7 @@ */ @Override public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { - return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(this.f), this.charset.toString()); + return Util.getCharContents(this, ignoreEncodingErrors, org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(this.f), this.charset.name()); } /**