Attachment 69723 Details for Bug 190493 – Better patch

[patch] Better patch

patch_190493.txt (text/plain), 5.93 KB, created by Olivier Thomann

on 2007-06-01 12:27:22 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2007-06-01 12:27:22 EDT

Size: 5.93 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v
>retrieving revision 1.302
>diff -u -r1.302 Main.java
>--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java	23 May 2007 18:57:22 -0000	1.302
>+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java	1 Jun 2007 16:26:27 -0000
>@@ -502,6 +502,14 @@
> 				"configure.incorrectExtDirsEntry", wrongPath)); //$NON-NLS-1$
> 		}
> 
>+		public void logIncorrectVMVersionForAnnotationProcessing() {
>+			if ((this.tagBits & Logger.XML) != 0) {
>+				this.parameters.put(Logger.MESSAGE, this.main.bind("configure.incorrectVMVersionforAPT")); //$NON-NLS-1$
>+				this.printTag(Logger.ERROR_TAG, this.parameters, true, true);
>+			}
>+			this.printlnErr(this.main.bind("configure.incorrectVMVersionforAPT")); //$NON-NLS-1$
>+		}
>+
> 		/**
> 		 *
> 		 */
>@@ -1515,7 +1523,49 @@
> 	}
> 	return MessageFormat.format(message, arguments);
> }
>-
>+/**
>+ * Return true if and only if the running VM supports the given minimal version
>+ * @param minimalSupportedVersion the given minimal version
>+ * @return true if and only if the running VM supports the given minimal version, false otherwise
>+ */
>+private boolean checkVMVersion(long minimalSupportedVersion) {
>+	// the format of this property is supposed to be xx.x where x are digits.
>+	String classFileVersion = System.getProperty("java.class.version"); //$NON-NLS-1$
>+	if (classFileVersion == null) {
>+		// by default we don't support a class file version we cannot recognize
>+		return false;
>+	}
>+	int index = classFileVersion.indexOf('.');
>+	if (index == -1) {
>+		// by default we don't support a class file version we cannot recognize
>+		return false;
>+	}
>+	int majorVersion;
>+	try {
>+		majorVersion = Integer.parseInt(classFileVersion.substring(0, index));
>+	} catch (NumberFormatException e) {
>+		// by default we don't support a class file version we cannot recognize
>+		return false;
>+	}
>+	switch(majorVersion) {
>+		case 45 : // 1.0 and 1.1
>+			return ClassFileConstants.JDK1_1 >= minimalSupportedVersion;
>+		case 46 : // 1.2
>+			return ClassFileConstants.JDK1_2 >= minimalSupportedVersion;
>+		case 47 : // 1.3
>+			return ClassFileConstants.JDK1_3 >= minimalSupportedVersion;
>+		case 48 : // 1.4
>+			return ClassFileConstants.JDK1_4 >= minimalSupportedVersion;
>+		case 49 : // 1.5
>+			return ClassFileConstants.JDK1_5 >= minimalSupportedVersion;
>+		case 50 : // 1.6
>+			return ClassFileConstants.JDK1_6 >= minimalSupportedVersion;
>+		case 51 : // 1.7
>+			return ClassFileConstants.JDK1_7 >= minimalSupportedVersion;
>+	}
>+	// unknown version
>+	return false;
>+}
> /*
>  *  Low-level API performing the actual compilation
>  */
>@@ -3329,9 +3379,14 @@
> 
> 	if (this.compilerOptions.complianceLevel >= ClassFileConstants.JDK1_6
> 			&& this.compilerOptions.processAnnotations) {
>-		initializeAnnotationProcessorManager();
>-		if (this.classNames != null) {
>-			this.batchCompiler.setBinaryTypes(processClassNames(this.batchCompiler.lookupEnvironment));
>+		if (checkVMVersion(ClassFileConstants.JDK1_6)) {
>+			initializeAnnotationProcessorManager();
>+			if (this.classNames != null) {
>+				this.batchCompiler.setBinaryTypes(processClassNames(this.batchCompiler.lookupEnvironment));
>+			}
>+		} else {
>+			// report a warning
>+			this.logger.logIncorrectVMVersionForAnnotationProcessing();
> 		}
> 	}
> 
>@@ -3396,6 +3451,9 @@
> 	} catch (IllegalAccessException e) {
> 		// should not happen
> 		throw new org.eclipse.jdt.internal.compiler.problem.AbortCompilation();
>+	} catch(UnsupportedClassVersionError e) {
>+		// report a warning
>+		this.logger.logIncorrectVMVersionForAnnotationProcessing();
> 	}
> }
> public void printUsage() {
>@@ -3918,11 +3976,11 @@
> 					&& CompilerOptions.versionToJdkLevel(targetVersion) < ClassFileConstants.JDK1_5){
> 				throw new InvalidInputException(this.bind("configure.incompatibleTargetForSource", (String) targetVersion, CompilerOptions.VERSION_1_5)); //$NON-NLS-1$
> 			}
>-	   		 // target must be 1.4 if source is 1.4
>-	   		if (CompilerOptions.versionToJdkLevel(sourceVersion) >= ClassFileConstants.JDK1_4
>+			// target must be 1.4 if source is 1.4
>+			if (CompilerOptions.versionToJdkLevel(sourceVersion) >= ClassFileConstants.JDK1_4
> 					&& CompilerOptions.versionToJdkLevel(targetVersion) < ClassFileConstants.JDK1_4){
> 				throw new InvalidInputException(this.bind("configure.incompatibleTargetForSource", (String) targetVersion, CompilerOptions.VERSION_1_4)); //$NON-NLS-1$
>-	   		}
>+			}
> 			// target cannot be greater than compliance level
> 			if (CompilerOptions.versionToJdkLevel(compliance) < CompilerOptions.versionToJdkLevel(targetVersion)){
> 				throw new InvalidInputException(this.bind("configure.incompatibleComplianceForTarget", (String)this.options.get(CompilerOptions.OPTION_Compliance), (String) targetVersion)); //$NON-NLS-1$
>Index: batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties,v
>retrieving revision 1.640
>diff -u -r1.640 messages.properties
>--- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	30 May 2007 14:59:48 -0000	1.640
>+++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	1 Jun 2007 16:26:27 -0000
>@@ -79,6 +79,7 @@
> configure.accessRuleAfterDestinationPath = access rules cannot follow destination path entries: {0}
> configure.duplicateDestinationPathEntry = duplicate destination path entry in {0} option
> configure.invalidClassName = invalid class name: {0}
>+configure.incorrectVMVersionforAPT=Annotation processing got disabled, since it requires a 1.6 compliant JVM
> 
> ### requestor
> requestor.error = {0}. ERROR in {1}

Actions: View | Diff

Attachments on bug 190493: 69722 | 69723 | 69990