Attachment 181399 Details for Bug 303511 – Updated patch

[patch] Updated patch

bug_303511.txt (text/plain), 13.72 KB, created by Jay Arthanareeswaran

on 2010-10-21 10:35:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jay Arthanareeswaran

Created: 2010-10-21 10:35:57 EDT

Size: 13.72 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/SourceMapper.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java,v
>retrieving revision 1.150
>diff -u -r1.150 SourceMapper.java
>--- model/org/eclipse/jdt/internal/core/SourceMapper.java	28 Jul 2010 16:17:01 -0000	1.150
>+++ model/org/eclipse/jdt/internal/core/SourceMapper.java	21 Oct 2010 14:33:26 -0000
>@@ -918,6 +918,7 @@
> 	public char[] findSource(String fullName) {
> 		char[] source = null;
> 		Object target = JavaModel.getTarget(this.sourcePath, true);
>+		String charSet = null;
> 		if (target instanceof IContainer) {
> 			IResource res = ((IContainer)target).findMember(fullName);
> 			if (res instanceof IFile) {
>@@ -928,6 +929,15 @@
> 				}
> 			}
> 		} else {
>+			try {
>+				// https://bugs.eclipse.org/bugs/show_bug.cgi?id=303511
>+				// For a resource inside the workspace, use the encoding set on the resource
>+				if (target instanceof IFile)
>+					charSet = ((IFile)target).getCharset();
>+			} catch (CoreException e) {
>+				// Ignore
>+			}
>+			
> 			// try to get the entry
> 			ZipEntry entry = null;
> 			ZipFile zip = null;
>@@ -937,7 +947,7 @@
> 				entry = zip.getEntry(fullName);
> 				if (entry != null) {
> 					// now read the source code
>-					source = readSource(entry, zip);
>+					source = readSource(entry, zip, charSet);
> 				}
> 			} catch (CoreException e) {
> 				return null;
>@@ -1275,11 +1285,11 @@
> 			this.typeDepth = -1;
> 		}
> 	}
>-	private char[] readSource(ZipEntry entry, ZipFile zip) {
>+	private char[] readSource(ZipEntry entry, ZipFile zip, String charSet) {
> 		try {
> 			byte[] bytes = Util.getZipEntryByteContent(entry, zip);
> 			if (bytes != null) {
>-				return Util.bytesToChar(bytes, this.encoding);
>+				return Util.bytesToChar(bytes, charSet == null ? this.encoding : charSet);
> 			}
> 		} catch (IOException e) {
> 			// ignore
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/EncodingTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/EncodingTests.java,v
>retrieving revision 1.53
>diff -u -r1.53 EncodingTests.java
>--- src/org/eclipse/jdt/core/tests/model/EncodingTests.java	28 Apr 2009 17:46:10 -0000	1.53
>+++ src/org/eclipse/jdt/core/tests/model/EncodingTests.java	21 Oct 2010 14:33:28 -0000
>@@ -24,9 +24,11 @@
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.NullProgressMonitor;
>+import org.eclipse.core.runtime.Path;
> import org.eclipse.core.runtime.content.IContentDescription;
> import org.eclipse.core.runtime.preferences.IEclipsePreferences;
> import org.eclipse.core.runtime.preferences.InstanceScope;
>+import org.eclipse.jdt.core.IClasspathEntry;
> import org.eclipse.jdt.core.ICompilationUnit;
> import org.eclipse.jdt.core.IJavaProject;
> import org.eclipse.jdt.core.IOpenable;
>@@ -929,7 +931,224 @@
> 			preferences.flush();
> 		}
> 	}
>+	
>+	/**
>+	 * Bug 303511: Allow to specify encoding for source attachments
>+	 * Test whether the source mapper picks the right encoding for the source attachment as a ZIP in workspace.
>+	 * The encoding could be explicitly set in the absense of which the inherited value from the project
>+	 * is taken.
>+	 *
>+	 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=303511"
>+	 */
>+	public void testBug303511() throws JavaModelException, CoreException {
>+
>+		// Set file encoding
>+		String encoding = "Shift-JIS";
>+		IFile zipFile = (IFile) this.encodingProject.findMember("testShiftJIS.zip"); //$NON-NLS-1$
>+		IFile sourceFile = (IFile) this.encodingProject.findMember("src/testShiftJIS/A.java");
>+		
>+		assertNotNull("Cannot find class file!", zipFile);
>+		zipFile.setCharset(encoding, null);
>+
>+		// Get class file and compare source (should not be the same as modify charset on zip file has no effect...)
>+		IPackageFragmentRoot root = getPackageFragmentRoot("Encoding", "testShiftJIS.jar");
>+		ISourceReference sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+		assertNotNull(sourceRef);
>+		String source = sourceRef.getSource();
>+		assertNotNull(source);
>+		String encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+		assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+
>+		// Reset zip file encoding
>+		zipFile.setCharset(null, null);
>+		String oldEncoding = this.encodingProject.getDefaultCharset();
>+		this.encodingProject.setDefaultCharset(encoding, null);
> 
>+		root = getPackageFragmentRoot("Encoding", "testShiftJIS.jar");
>+		sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+		assertNotNull(sourceRef);
>+		source = sourceRef.getSource();
>+		assertNotNull(source);
>+		encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+		assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+
>+		// Reset zip file encoding
>+		zipFile.setCharset(null, null);
>+		this.encodingProject.setDefaultCharset(oldEncoding, null);
>+	}
>+
>+	/**
>+	 * Bug 303511: Allow to specify encoding for source attachments
>+	 * Test whether the source mapper picks the right encoding for an external source attachment
>+	 * The attachment could be an external folder or external archive and have the encoding 
>+	 * explicitly set. In the absense of encoding for the source attachment resource, the default
>+	 * encoding from the workspace is applied.  
>+	 *
>+	 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=303511"
>+	 */
>+	public void testBug303511a() throws JavaModelException, CoreException {
>+		// Set file encoding
>+		String encoding = "Shift-JIS";
>+		String externalPath = this.encodingProject.getLocation().toOSString() + File.separator + "testShiftJIS.zip";
>+		IFile sourceFile = (IFile) this.encodingProject.findMember("src/testShiftJIS/A.java");
>+		getWorkspaceRoot().setDefaultCharset(encoding, null);
>+		
>+		IClasspathEntry[] entries = this.encodingJavaProject.getRawClasspath();
>+		IClasspathEntry oldEntry = null;
>+		for (int index = 0; index < entries.length; index++) {
>+			IClasspathEntry entry = entries[index];
>+			if (entry.getPath().toOSString().endsWith("testShiftJIS.jar")) {
>+				oldEntry = entry;
>+				IClasspathEntry newEntry = JavaCore.newLibraryEntry(entry.getPath(), new Path(externalPath), null);
>+				entries[index] = newEntry; 
>+			}
>+		}
>+		this.encodingJavaProject.setRawClasspath(entries, null);
>+		this.encodingJavaProject.getResolvedClasspath(true);
>+		
>+		// Get class file and compare source (should not be the same as modify charset on zip file has no effect...)
>+		IPackageFragmentRoot root = getPackageFragmentRoot("Encoding", "testShiftJIS.jar");
>+		ISourceReference sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+		assertNotNull(sourceRef);
>+		String source = sourceRef.getSource();
>+		assertNotNull(source);
>+		String encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+		assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+
>+		entries = this.encodingJavaProject.getRawClasspath();
>+		String sourcePath = this.encodingProject.getLocation().toOSString() + File.separator + "src";
>+		for (int index = 0; index < entries.length; index++) {
>+			IClasspathEntry entry = entries[index];
>+			if (entry.getPath().toOSString().endsWith("testShiftJIS.jar")) {
>+				IClasspathEntry newEntry = JavaCore.newLibraryEntry(entry.getPath(), new Path(sourcePath), null);
>+				entries[index] = newEntry; 
>+			}
>+		}
>+		this.encodingJavaProject.setRawClasspath(entries, null);
>+		this.encodingJavaProject.getResolvedClasspath(true);
>+		
>+		entries = this.encodingJavaProject.getRawClasspath();
>+		for (int index = 0; index < entries.length; index++) {
>+			IClasspathEntry entry = entries[index];
>+			if (entry.getPath().toOSString().endsWith("testShiftJIS.jar")) {
>+				entries[index] = oldEntry;
>+			}
>+		}
>+		this.encodingJavaProject.setRawClasspath(entries, null);
>+		this.encodingJavaProject.getResolvedClasspath(true);
>+		getWorkspaceRoot().setDefaultCharset(wkspEncoding, null);
>+	}
>+
>+	/**
>+	 * Bug 303511: Allow to specify encoding for source attachments
>+	 * Test that, for a source attachment in form of archives from another project (in the same workspace), the
>+	 * encoding of the archive (IResource), if set, is used. In the absense of explicit encoding, the encoding 
>+	 * of the project that contains this archive is used.
>+	 *
>+	 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=303511"
>+	 */
>+	public void testBug303511b() throws Exception{
>+		try{
>+			IJavaProject project = this.createJavaProject("Encoding2", new String[] {""}, "");
>+			String oldEncoding = this.encodingProject.getDefaultCharset();
>+			String encoding = "Shift-JIS";
>+			IFile zipFile = (IFile) this.encodingProject.findMember("testShiftJIS.zip"); //$NON-NLS-1$
>+			IFile sourceFile = (IFile) this.encodingProject.findMember("src/testShiftJIS/A.java");
>+			assertNotNull("Cannot find class file!", zipFile);
>+
>+			zipFile.setCharset(encoding, null);
>+
>+			IClasspathEntry[] entries = this.encodingJavaProject.getRawClasspath();
>+			IClasspathEntry newEntry = null;
>+			for (int index = 0; index < entries.length; index++) {
>+				IClasspathEntry entry = entries[index];
>+				if (entry.getPath().toOSString().endsWith("testShiftJIS.jar")) {
>+					newEntry = entries[index]; 
>+				}
>+			}
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path("/Encoding/testShiftJIS.zip"), null)}, null);
>+
>+			IPackageFragmentRoot root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			ISourceReference sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			String source = sourceRef.getSource();
>+			assertNotNull(source);
>+			String encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+
>+			zipFile.setCharset(null, null);
>+			this.encodingProject.setDefaultCharset(encoding, null);
>+
>+			root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			source = sourceRef.getSource();
>+			assertNotNull(source);
>+			encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+			
>+			this.encodingProject.setDefaultCharset(oldEncoding, null);
>+		}
>+		finally {
>+			deleteProject("Encoding2");
>+		}
>+	}
>+	/**
>+	 * Bug 303511: Allow to specify encoding for source attachments
>+	 * Test that, for a source attachment in form of folder from another project (in the same workspace), the
>+	 * encoding of the folder (IResource), if set, is used. In the absense of explicit encoding, the encoding 
>+	 * of the project which contains this folder is used.
>+	 *
>+	 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=303511"
>+	 */
>+	public void testBug303511c() throws Exception{
>+		try{
>+			IJavaProject project = this.createJavaProject("Encoding2", new String[] {""}, "");
>+			String oldEncoding = this.encodingProject.getDefaultCharset();
>+			String encoding = "Shift-JIS";
>+			IFile zipFile = (IFile) this.encodingProject.findMember("testShiftJIS.zip"); //$NON-NLS-1$
>+			IFile sourceFile = (IFile) this.encodingProject.findMember("src/testShiftJIS/A.java");
>+			assertNotNull("Cannot find class file!", zipFile);
>+			
>+			IClasspathEntry[] entries = this.encodingJavaProject.getRawClasspath();
>+			IClasspathEntry newEntry = null;
>+			for (int index = 0; index < entries.length; index++) {
>+				IClasspathEntry entry = entries[index];
>+				if (entry.getPath().toOSString().endsWith("testShiftJIS.jar")) {
>+					newEntry = entries[index]; 
>+				}
>+			}
>+
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path("/Encoding/src"), null)}, null);
>+			this.encodingProject.setDefaultCharset(encoding, null);
>+			sourceFile.setCharset(null, null);
>+			
>+			IPackageFragmentRoot root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			ISourceReference sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			String source = sourceRef.getSource();
>+			assertNotNull(source);
>+			String encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+			
>+			this.encodingProject.setDefaultCharset(oldEncoding, null);
>+			sourceFile.setCharset(encoding, null);
>+
>+			root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			source = sourceRef.getSource();
>+			assertNotNull(source);
>+			encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));	
>+			
>+			sourceFile.setCharset(null, null);
>+		}
>+		finally {
>+			deleteProject("Encoding2");
>+		}
>+	}
>+	
> 	private void verifyUtf8BOM(IFile file) throws CoreException {
> 		assertNull("File should not have any explicit charset", file.getCharset(false));
> 		IContentDescription contentDescription = file.getContentDescription();

Actions: View | Diff

Attachments on bug 303511: 181323 | 181364 | 181365 | 181399 | 181484 | 181601