Attachment 129068 Details for Bug 267789 – Proposed patch

[patch] Proposed patch

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

on 2009-03-17 08:20:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2009-03-17 08:20:11 EDT

Size: 4.20 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.performance
>Index: src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceBuildTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceBuildTests.java,v
>retrieving revision 1.29
>diff -u -r1.29 FullSourceWorkspaceBuildTests.java
>--- src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceBuildTests.java	27 Jun 2008 16:02:00 -0000	1.29
>+++ src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceBuildTests.java	17 Mar 2009 09:22:53 -0000
>@@ -217,6 +217,8 @@
> 			}
> 			System.out.println(this.scenarioShortName+": Unexpected ERROR marker(s):\n" + debugBuffer.toString());
> 			System.out.println("--------------------");
>+			String target = javaProject == null ? "workspace" : javaProject.getElementName();
>+			assertEquals("Found "+size+" unexpected errors while building "+target, 0, size);
> 		}
> 		if (DEBUG) System.out.println("done");
> 
>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.55
>diff -u -r1.55 FullSourceWorkspaceTests.java
>--- src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTests.java	7 Mar 2009 02:04:23 -0000	1.55
>+++ src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTests.java	17 Mar 2009 09:22:53 -0000
>@@ -642,26 +642,20 @@
> 		}
> 		System.out.println("("+(System.currentTimeMillis()-start)+"ms)");
> 
>-		// Init JRE_LIB variable
>+		// Create lib entries for the JDKs
> 		String[] jdkLibs = Util.getJavaClassLibs();
>-		int length = jdkLibs.length;
>-		String jdkLib = null;
>-		for (int i=0; i<length; i++) {
>-			if (jdkLibs[i].endsWith("rt.jar")) {
>-				jdkLib = jdkLibs[i];
>-				break;
>-			}
>-		}
>-		if (jdkLib == null) {
>-			throw new RuntimeException("Cannot set JRE_LIB classpath variable as the rt.jar lib was not found!!!");
>+		int jdkLibsLength = jdkLibs.length;
>+		IClasspathEntry[] jdkEntries = new IClasspathEntry[jdkLibsLength];
>+		for (int i=0; i<jdkLibsLength; i++) {
>+			jdkEntries[i] = JavaCore.newLibraryEntry(new Path(jdkLibs[i]), null, null);
> 		}
>-		JavaCore.setClasspathVariable("JRE_LIB", new Path(jdkLib), null);
> 
> 		// Set classpaths (workaround bug 73253 Project references not set on project open)
> 		System.out.print("Set projects classpaths...");
>+		start = System.currentTimeMillis();
> 		ALL_PROJECTS = JavaCore.create(workspaceRoot).getJavaProjects();
>-		length = ALL_PROJECTS.length;
>-		for (int i = 0; i < length; i++) {
>+		int projectsLength = ALL_PROJECTS.length;
>+		for (int i = 0; i < projectsLength; i++) {
> 			String projectName = ALL_PROJECTS[i].getElementName();
> 			if (BIG_PROJECT_NAME.equals(projectName)) continue; // will be set later
> 			if (JavaCore.PLUGIN_ID.equals(projectName)) {
>@@ -669,14 +663,21 @@
> //			} else if (JUNIT_PROJECT_NAME.equals(projectName)) {
> //				JUNIT_PROJECT = ALL_PROJECTS[i];
> 			}
>-			ALL_PROJECTS[i].setRawClasspath(ALL_PROJECTS[i].getRawClasspath(), null);
>+			
>+			// Set jdk jars onto the project classpath
>+			IClasspathEntry[] entries = ALL_PROJECTS[i].getRawClasspath();
>+			int entriesLength = entries.length;
>+			System.arraycopy(entries, 0, entries = new IClasspathEntry[jdkLibsLength+entriesLength], jdkLibsLength, entriesLength);
>+			System.arraycopy(jdkEntries, 0, entries, 0, jdkLibsLength);
>+			ALL_PROJECTS[i].setRawClasspath(entries, null);
>+
> 			// Make Big project dependent from jdt.core one
> //			IClasspathEntry[] bigProjectEntries = BIG_PROJECT.getRawClasspath();
> //			int bpeLength = bigProjectEntries.length;
> //			System.arraycopy(bigProjectEntries, 0, bigProjectEntries = new IClasspathEntry[bpeLength+1], 0, bpeLength);
> //			bigProjectEntries[bpeLength] = JavaCore.newProjectEntry(JDT_CORE_PROJECT.getPath());
> 		}
>-		System.out.println("done");
>+		System.out.println("("+(System.currentTimeMillis()-start)+"ms)");
> 
> 		// Initialize Parser wokring copy
> 		IJavaElement element = JDT_CORE_PROJECT.findType("org.eclipse.jdt.internal.compiler.parser.Parser");

Actions: View | Diff

Attachments on bug 267789: 128188 | 129068