Attachment 203014 Details for Bug 357029 – fix

[patch] fix

Bug_357029.patch (text/plain), 1.29 KB, created by Stephan Herrmann

on 2011-09-08 13:35:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Herrmann

Created: 2011-09-08 13:35:57 EDT

Size: 1.29 KB

patch

obsolete

>Index: model/org/eclipse/jdt/core/JavaConventions.java
>===================================================================
>--- model/org/eclipse/jdt/core/JavaConventions.java	(revision 1962)
>+++ model/org/eclipse/jdt/core/JavaConventions.java	(working copy)
>@@ -42,6 +42,14 @@
> 	private static final String PACKAGE_INFO = new String(TypeConstants.PACKAGE_INFO_NAME);
> 	private static final Scanner SCANNER = new Scanner(false /*comment*/, true /*whitespace*/, false /*nls*/, ClassFileConstants.JDK1_3 /*sourceLevel*/, null/*taskTag*/, null/*taskPriorities*/, true /*taskCaseSensitive*/);
> 
>+//{ObjectTeams: be conservative: this class has no context so cannot distinguish OT vs. Java projects, always assume pure Java:
>+	static {
>+		SCANNER.forceBaseIsIdentifier();
>+		SCANNER.parsePureJavaOnly = true;
>+		SCANNER.parseOTJonly = false;
>+	}
>+//SH}
>+
> 	private JavaConventions() {
> 		// Not instantiable
> 	}
>@@ -80,9 +88,6 @@
> 
> 		try {
> 			SCANNER.setSource(id.toCharArray());
>-//{ObjectTeams: recognize "base" as an identifier in plain java code:
>-			SCANNER.forceBaseIsIdentifier();
>-// SH}
> 			int token = SCANNER.scanIdentifier();
> 			if (token != TerminalTokens.TokenNameIdentifier) return null;
> 			if (SCANNER.currentPosition == SCANNER.eofPosition) { // to handle case where we had an ArrayIndexOutOfBoundsException

Actions: View | Diff

Attachments on bug 357029: 202958 | 202959 | 203014 | 203109