View | Details | Raw Unified | Return to bug 310002 | Differences between
and this patch

Collapse All | Expand All

(-)model/org/eclipse/jdt/core/ToolFactory.java (-7 / +29 lines)
Lines 395-402 Link Here
395
	 * @see org.eclipse.jdt.core.compiler.IScanner
395
	 * @see org.eclipse.jdt.core.compiler.IScanner
396
	 */
396
	 */
397
	public static IScanner createScanner(boolean tokenizeComments, boolean tokenizeWhiteSpace, boolean assertMode, boolean recordLineSeparator){
397
	public static IScanner createScanner(boolean tokenizeComments, boolean tokenizeWhiteSpace, boolean assertMode, boolean recordLineSeparator){
398
398
		// use default workspace compliance
399
		PublicScanner scanner = new PublicScanner(tokenizeComments, tokenizeWhiteSpace, false/*nls*/, assertMode ? ClassFileConstants.JDK1_4 : ClassFileConstants.JDK1_3/*sourceLevel*/, null/*taskTags*/, null/*taskPriorities*/, true/*taskCaseSensitive*/);
399
		long complianceLevelValue = CompilerOptions.versionToJdkLevel(JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE));
400
		if (complianceLevelValue == 0) complianceLevelValue = ClassFileConstants.JDK1_4; // fault-tolerance
401
		PublicScanner scanner =
402
			new PublicScanner(
403
				tokenizeComments,
404
				tokenizeWhiteSpace,
405
				false/*nls*/,
406
				assertMode ? ClassFileConstants.JDK1_4 : ClassFileConstants.JDK1_3/*sourceLevel*/,
407
				complianceLevelValue,
408
				null/*taskTags*/,
409
				null/*taskPriorities*/,
410
				true/*taskCaseSensitive*/);
400
		scanner.recordLineSeparator = recordLineSeparator;
411
		scanner.recordLineSeparator = recordLineSeparator;
401
		return scanner;
412
		return scanner;
402
	}
413
	}
Lines 437-446 Link Here
437
     * @since 3.0
448
     * @since 3.0
438
	 */
449
	 */
439
	public static IScanner createScanner(boolean tokenizeComments, boolean tokenizeWhiteSpace, boolean recordLineSeparator, String sourceLevel) {
450
	public static IScanner createScanner(boolean tokenizeComments, boolean tokenizeWhiteSpace, boolean recordLineSeparator, String sourceLevel) {
440
		PublicScanner scanner = null;
451
		// use default workspace compliance
441
		long level = CompilerOptions.versionToJdkLevel(sourceLevel);
452
		long complianceLevelValue = CompilerOptions.versionToJdkLevel(JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE));
442
		if (level == 0) level = ClassFileConstants.JDK1_3; // fault-tolerance
453
		if (complianceLevelValue == 0) complianceLevelValue = ClassFileConstants.JDK1_4; // fault-tolerance
443
		scanner = new PublicScanner(tokenizeComments, tokenizeWhiteSpace, false/*nls*/,level /*sourceLevel*/, null/*taskTags*/, null/*taskPriorities*/, true/*taskCaseSensitive*/);
454
		long sourceLevelValue = CompilerOptions.versionToJdkLevel(sourceLevel);
455
		if (sourceLevelValue == 0) sourceLevelValue = ClassFileConstants.JDK1_3; // fault-tolerance
456
		PublicScanner scanner =
457
			new PublicScanner(
458
				tokenizeComments,
459
				tokenizeWhiteSpace,
460
				false/*nls*/,
461
				sourceLevelValue /*sourceLevel*/,
462
				complianceLevelValue,
463
				null/*taskTags*/,
464
				null/*taskPriorities*/,
465
				true/*taskCaseSensitive*/);
444
		scanner.recordLineSeparator = recordLineSeparator;
466
		scanner.recordLineSeparator = recordLineSeparator;
445
		return scanner;
467
		return scanner;
446
	}
468
	}
Lines 488-494 Link Here
488
		long sourceLevelValue = CompilerOptions.versionToJdkLevel(sourceLevel);
510
		long sourceLevelValue = CompilerOptions.versionToJdkLevel(sourceLevel);
489
		if (sourceLevelValue == 0) sourceLevelValue = ClassFileConstants.JDK1_3; // fault-tolerance
511
		if (sourceLevelValue == 0) sourceLevelValue = ClassFileConstants.JDK1_3; // fault-tolerance
490
		long complianceLevelValue = CompilerOptions.versionToJdkLevel(complianceLevel);
512
		long complianceLevelValue = CompilerOptions.versionToJdkLevel(complianceLevel);
491
		if (complianceLevelValue == 0) complianceLevelValue = ClassFileConstants.JDK1_3; // fault-tolerance
513
		if (complianceLevelValue == 0) complianceLevelValue = ClassFileConstants.JDK1_4; // fault-tolerance
492
		scanner = new PublicScanner(tokenizeComments, tokenizeWhiteSpace, false/*nls*/,sourceLevelValue /*sourceLevel*/, complianceLevelValue, null/*taskTags*/, null/*taskPriorities*/, true/*taskCaseSensitive*/);
514
		scanner = new PublicScanner(tokenizeComments, tokenizeWhiteSpace, false/*nls*/,sourceLevelValue /*sourceLevel*/, complianceLevelValue, null/*taskTags*/, null/*taskPriorities*/, true/*taskCaseSensitive*/);
493
		scanner.recordLineSeparator = recordLineSeparator;
515
		scanner.recordLineSeparator = recordLineSeparator;
494
		return scanner;
516
		return scanner;

Return to bug 310002