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

(-).settings/org.eclipse.jdt.core.prefs (-2 / +25 lines)
Lines 1-4 Link Here
1
#Tue Mar 20 13:18:07 CET 2007
1
#Thu Sep 11 15:46:35 CEST 2008
2
eclipse.preferences.version=1
2
eclipse.preferences.version=1
3
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
3
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
4
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
4
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
Lines 16-34 Link Here
16
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
16
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
17
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
17
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
18
org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
18
org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
19
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
19
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
20
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
21
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
22
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
20
org.eclipse.jdt.core.compiler.problem.deprecation=warning
23
org.eclipse.jdt.core.compiler.problem.deprecation=warning
21
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
24
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
22
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
25
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
23
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
26
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
24
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
27
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
25
org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
28
org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
29
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
30
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
26
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
31
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
27
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
32
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
28
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
33
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
29
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
34
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
30
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
35
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
31
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
36
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
37
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
32
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
38
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
33
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
39
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
34
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
40
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
Lines 37-71 Link Here
37
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
43
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
38
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
44
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
39
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
45
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
46
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
40
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
47
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
41
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
48
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
42
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
49
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
43
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
50
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
44
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
51
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
45
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
52
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
53
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
46
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
54
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
55
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
47
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
56
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
48
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
57
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
49
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
58
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
50
org.eclipse.jdt.core.compiler.problem.nullReference=warning
59
org.eclipse.jdt.core.compiler.problem.nullReference=warning
51
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
60
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
61
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
52
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
62
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
63
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
64
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
65
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
66
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
53
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
67
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
54
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
68
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
69
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
55
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
70
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
71
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
72
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
56
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
73
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
74
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
57
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
75
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
58
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
76
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
59
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
77
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=warning
60
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
78
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
61
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
79
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
80
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
81
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
62
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
82
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
63
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
83
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
84
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
64
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
85
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
65
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
86
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
87
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
66
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
88
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
67
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
89
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
68
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
90
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
91
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
69
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
92
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
70
org.eclipse.jdt.core.compiler.source=1.3
93
org.eclipse.jdt.core.compiler.source=1.3
71
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
94
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceBuildTests.java (+2 lines)
Lines 217-222 Link Here
217
			}
217
			}
218
			System.out.println(this.scenarioShortName+": Unexpected ERROR marker(s):\n" + debugBuffer.toString());
218
			System.out.println(this.scenarioShortName+": Unexpected ERROR marker(s):\n" + debugBuffer.toString());
219
			System.out.println("--------------------");
219
			System.out.println("--------------------");
220
			String target = javaProject == null ? "workspace" : javaProject.getElementName();
221
			assertEquals("Found "+size+" unexpected errors while building "+target, 0, size);
220
		}
222
		}
221
		if (DEBUG) System.out.println("done");
223
		if (DEBUG) System.out.println("done");
222
224
(-)src/org/eclipse/jdt/core/tests/performance/AllPerformanceTests.java (-1 / +1 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2007 IBM Corporation and others.
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceASTTests.java (-1 / +1 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2007 IBM Corporation and others.
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTests.java (-18 / +24 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2008 IBM Corporation and others.
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 618-624 Link Here
618
		File[] directories = wkspDir.listFiles(filter);
618
		File[] directories = wkspDir.listFiles(filter);
619
		long start = System.currentTimeMillis();
619
		long start = System.currentTimeMillis();
620
		int dirLength = directories.length;
620
		int dirLength = directories.length;
621
		if (dirLength != 62) {
621
		if (dirLength < 62) {
622
			String fullSourceZipPath = getPluginDirectoryPath() + File.separator + "full-source-R3_0.zip";
622
			String fullSourceZipPath = getPluginDirectoryPath() + File.separator + "full-source-R3_0.zip";
623
			System.out.println("Unzipping "+fullSourceZipPath);
623
			System.out.println("Unzipping "+fullSourceZipPath);
624
			System.out.print("	in "+targetWorkspacePath+"...");
624
			System.out.print("	in "+targetWorkspacePath+"...");
Lines 642-667 Link Here
642
		}
642
		}
643
		System.out.println("("+(System.currentTimeMillis()-start)+"ms)");
643
		System.out.println("("+(System.currentTimeMillis()-start)+"ms)");
644
644
645
		// Init JRE_LIB variable
645
		// Create lib entries for the JDKs
646
		System.out.print("Create lib entries for the JDKs...");
647
		start = System.currentTimeMillis();
646
		String[] jdkLibs = Util.getJavaClassLibs();
648
		String[] jdkLibs = Util.getJavaClassLibs();
647
		int length = jdkLibs.length;
649
		int jdkLibsLength = jdkLibs.length;
648
		String jdkLib = null;
650
		IClasspathEntry[] jdkEntries = new IClasspathEntry[jdkLibsLength];
649
		for (int i=0; i<length; i++) {
651
		for (int i=0; i<jdkLibsLength; i++) {
650
			if (jdkLibs[i].endsWith("rt.jar")) {
652
			jdkEntries[i] = JavaCore.newLibraryEntry(new Path(jdkLibs[i]), null, null);
651
				jdkLib = jdkLibs[i];
652
				break;
653
			}
654
		}
653
		}
655
		if (jdkLib == null) {
654
		System.out.println(jdkLibsLength+" found ("+(System.currentTimeMillis()-start)+"ms)");
656
			throw new RuntimeException("Cannot set JRE_LIB classpath variable as the rt.jar lib was not found!!!");
657
		}
658
		JavaCore.setClasspathVariable("JRE_LIB", new Path(jdkLib), null);
659
655
660
		// Set classpaths (workaround bug 73253 Project references not set on project open)
656
		// Set classpaths (workaround bug 73253 Project references not set on project open)
661
		System.out.print("Set projects classpaths...");
657
		System.out.print("Set projects classpaths...");
658
		start = System.currentTimeMillis();
662
		ALL_PROJECTS = JavaCore.create(workspaceRoot).getJavaProjects();
659
		ALL_PROJECTS = JavaCore.create(workspaceRoot).getJavaProjects();
663
		length = ALL_PROJECTS.length;
660
		int projectsLength = ALL_PROJECTS.length;
664
		for (int i = 0; i < length; i++) {
661
		for (int i = 0; i < projectsLength; i++) {
665
			String projectName = ALL_PROJECTS[i].getElementName();
662
			String projectName = ALL_PROJECTS[i].getElementName();
666
			if (BIG_PROJECT_NAME.equals(projectName)) continue; // will be set later
663
			if (BIG_PROJECT_NAME.equals(projectName)) continue; // will be set later
667
			if (JavaCore.PLUGIN_ID.equals(projectName)) {
664
			if (JavaCore.PLUGIN_ID.equals(projectName)) {
Lines 669-682 Link Here
669
//			} else if (JUNIT_PROJECT_NAME.equals(projectName)) {
666
//			} else if (JUNIT_PROJECT_NAME.equals(projectName)) {
670
//				JUNIT_PROJECT = ALL_PROJECTS[i];
667
//				JUNIT_PROJECT = ALL_PROJECTS[i];
671
			}
668
			}
672
			ALL_PROJECTS[i].setRawClasspath(ALL_PROJECTS[i].getRawClasspath(), null);
669
670
			// Set jdk jars onto the project classpath
671
			IClasspathEntry[] entries = ALL_PROJECTS[i].getRawClasspath();
672
			int entriesLength = entries.length;
673
			if (!entries[0].equals(jdkEntries[0])) {
674
				System.arraycopy(entries, 0, entries = new IClasspathEntry[jdkLibsLength+entriesLength], jdkLibsLength, entriesLength);
675
				System.arraycopy(jdkEntries, 0, entries, 0, jdkLibsLength);
676
				ALL_PROJECTS[i].setRawClasspath(entries, null);
677
			}
678
673
			// Make Big project dependent from jdt.core one
679
			// Make Big project dependent from jdt.core one
674
//			IClasspathEntry[] bigProjectEntries = BIG_PROJECT.getRawClasspath();
680
//			IClasspathEntry[] bigProjectEntries = BIG_PROJECT.getRawClasspath();
675
//			int bpeLength = bigProjectEntries.length;
681
//			int bpeLength = bigProjectEntries.length;
676
//			System.arraycopy(bigProjectEntries, 0, bigProjectEntries = new IClasspathEntry[bpeLength+1], 0, bpeLength);
682
//			System.arraycopy(bigProjectEntries, 0, bigProjectEntries = new IClasspathEntry[bpeLength+1], 0, bpeLength);
677
//			bigProjectEntries[bpeLength] = JavaCore.newProjectEntry(JDT_CORE_PROJECT.getPath());
683
//			bigProjectEntries[bpeLength] = JavaCore.newProjectEntry(JDT_CORE_PROJECT.getPath());
678
		}
684
		}
679
		System.out.println("done");
685
		System.out.println("("+(System.currentTimeMillis()-start)+"ms)");
680
686
681
		// Initialize Parser wokring copy
687
		// Initialize Parser wokring copy
682
		IJavaElement element = JDT_CORE_PROJECT.findType("org.eclipse.jdt.internal.compiler.parser.Parser");
688
		IJavaElement element = JDT_CORE_PROJECT.findType("org.eclipse.jdt.internal.compiler.parser.Parser");
(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceCompletionTests.java (-1 / +1 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2007 IBM Corporation and others.
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceFormatterTests.java (-1 / +1 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2007 IBM Corporation and others.
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceCompleteSearchTests.java (-1 / +1 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2007 IBM Corporation and others.
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceSearchTests.java (-23 / +15 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2008 IBM Corporation and others.
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 204-212 Link Here
204
	 *
204
	 *
205
	 * First wait that already started indexing jobs ends before performing test and measure.
205
	 * First wait that already started indexing jobs ends before performing test and measure.
206
	 * Consider this initial indexing jobs as warm-up for this test.
206
	 * Consider this initial indexing jobs as warm-up for this test.
207
	 *
208
	 * TODO (frederic) After 3.3, activate several iteration for this test to have more accurate results,
209
	 * 	then rename the test as numbers will be different...
210
	 */
207
	 */
211
	public void testIndexing() throws CoreException {
208
	public void testIndexing() throws CoreException {
212
		tagAsSummary("Indexing all workspace projects", false); // do NOT put in fingerprint
209
		tagAsSummary("Indexing all workspace projects", false); // do NOT put in fingerprint
Lines 214-241 Link Here
214
		// Wait for indexing end (we use initial indexing as warm-up)
211
		// Wait for indexing end (we use initial indexing as warm-up)
215
		AbstractJavaModelTests.waitUntilIndexesReady();
212
		AbstractJavaModelTests.waitUntilIndexesReady();
216
213
217
		// Measures
214
		// Remove project previous indexing
218
		int measures = false ? MEASURES_COUNT/2 : 1;
215
		INDEX_MANAGER.removeIndexFamily(new Path(""));
219
		for (int i=0; i<measures; i++) {
216
		INDEX_MANAGER.reset();
220
221
			// Remove project previous indexing
222
			INDEX_MANAGER.removeIndexFamily(new Path(""));
223
			INDEX_MANAGER.reset();
224
217
225
			// Clean memory
218
		// Clean memory
226
			runGc();
219
		runGc();
227
220
228
			// Restart brand new indexing
221
		// Restart brand new indexing
229
			INDEX_MANAGER.request(new Measuring(true/*start measuring*/));
222
		INDEX_MANAGER.request(new Measuring(true/*start measuring*/));
230
			for (int j=0, length=ALL_PROJECTS.length; j<length; j++) {
223
		for (int j=0, length=ALL_PROJECTS.length; j<length; j++) {
231
				INDEX_MANAGER.indexAll(ALL_PROJECTS[j].getProject());
224
			INDEX_MANAGER.indexAll(ALL_PROJECTS[j].getProject());
232
			}
233
			AbstractJavaModelTests.waitUntilIndexesReady();
234
235
			// end measure
236
			INDEX_MANAGER.request(new Measuring(false /*end measuring*/));
237
			AbstractJavaModelTests.waitUntilIndexesReady();
238
		}
225
		}
226
		AbstractJavaModelTests.waitUntilIndexesReady();
227
228
		// end measure
229
		INDEX_MANAGER.request(new Measuring(false /*end measuring*/));
230
		AbstractJavaModelTests.waitUntilIndexesReady();
239
231
240
		// Commit
232
		// Commit
241
		commitMeasurements();
233
		commitMeasurements();
(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTypeHierarchyTests.java (-1 / +1 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2007 IBM Corporation and others.
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
(-)src/org/eclipse/jdt/core/tests/performance/util/JdtCorePerformanceMeterPlugin.java (-1 / +1 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2005 IBM Corporation and others.
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at

Return to bug 269964