Attachment 130245 Details for Bug 270409 – Proposed patch in perf_34x stream

[patch] Proposed patch in perf_34x stream

v00.txt (text/plain), 2.29 KB, created by Frederic Fusier

on 2009-03-30 10:48:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2009-03-30 10:48:35 EDT

Size: 2.29 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.performance
>Index: src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTests.java,v
>retrieving revision 1.49.4.3
>diff -u -r1.49.4.3 FullSourceWorkspaceTests.java
>--- src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTests.java	25 Mar 2009 16:23:13 -0000	1.49.4.3
>+++ src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTests.java	30 Mar 2009 14:48:19 -0000
>@@ -643,13 +643,17 @@
> 		System.out.println("("+(System.currentTimeMillis()-start)+"ms)");
> 
> 		// Create lib entries for the JDKs
>+		String jreLibPath = JavaCore.getClasspathVariable("JRE_LIB").toOSString();
> 		System.out.print("Create lib entries for the JDKs...");
> 		start = System.currentTimeMillis();
> 		String[] jdkLibs = Util.getJavaClassLibs();
> 		int jdkLibsLength = jdkLibs.length;
> 		IClasspathEntry[] jdkEntries = new IClasspathEntry[jdkLibsLength];
>+		int jdkEntriesCount = 0;
> 		for (int i=0; i<jdkLibsLength; i++) {
>-			jdkEntries[i] = JavaCore.newLibraryEntry(new Path(jdkLibs[i]), null, null);
>+			if (!jdkLibs[i].equals(jreLibPath)) { // do not include JRE_LIB in additional JDK entries
>+				jdkEntries[jdkEntriesCount++] = JavaCore.newLibraryEntry(new Path(jdkLibs[i]), null, null);
>+			}
> 		}
> 		System.out.println(jdkLibsLength+" found ("+(System.currentTimeMillis()-start)+"ms)");
> 
>@@ -670,9 +674,9 @@
> 			// Set jdk jars onto the project classpath
> 			IClasspathEntry[] entries = ALL_PROJECTS[i].getRawClasspath();
> 			int entriesLength = entries.length;
>-			if (!entries[0].equals(jdkEntries[0])) {
>-				System.arraycopy(entries, 0, entries = new IClasspathEntry[jdkLibsLength+entriesLength], jdkLibsLength, entriesLength);
>-				System.arraycopy(jdkEntries, 0, entries, 0, jdkLibsLength);
>+			if (!entries[entriesLength-1].equals(jdkEntries[jdkEntriesCount-1])) {
>+				System.arraycopy(entries, 0, entries = new IClasspathEntry[jdkEntriesCount+entriesLength], 0, entriesLength);
>+				System.arraycopy(jdkEntries, 0, entries, entriesLength, jdkEntriesCount);
> 				ALL_PROJECTS[i].setRawClasspath(entries, null);
> 			}
>

Actions: View | Diff

Attachments on bug 270409: 130245