fixes transpiler for Eclipse photon. adds timestamp to dist dir

hansonr · hansonr · commit f0c67c50b673 · 2018-07-05T09:11:46.000+01:00
diff --git a/sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar b/sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar
diff --git a/sources/net.sf.j2s.core/dist/timestamp b/sources/net.sf.j2s.core/dist/timestamp
@@ -0,0 +1 @@
+05/07/2018 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/builder/AbstractImageBuilder.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/builder/AbstractImageBuilder.java
@@ -529,7 +529,8 @@ public ICompilationUnit fromIFile(IFile file) {
 protected void initializeAnnotationProcessorManager(Compiler newCompiler) {
 	AbstractAnnotationProcessorManager annotationManager = JavaModelManager.getJavaModelManager().createAnnotationProcessorManager();
 	if (annotationManager != null) {
-		annotationManager.configureFromPlatform(newCompiler, this, this.javaBuilder.javaProject);
+		// BH added , true for photon
+		annotationManager.configureFromPlatform(newCompiler, this, this.javaBuilder.javaProject, true);
 		annotationManager.setErr(new PrintWriter(System.err));
 		annotationManager.setOut(new PrintWriter(System.out));
 	}
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/builder/ClasspathDirectory.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/builder/ClasspathDirectory.java
@@ -123,11 +123,12 @@ public NameEnvironmentAnswer findClass(String binaryFileName, String qualifiedPa
 	if (reader != null) {
 		String fileNameWithoutExtension = qualifiedBinaryFileName.substring(0, qualifiedBinaryFileName.length() - SuffixConstants.SUFFIX_CLASS.length);
 		if (this.externalAnnotationPath != null) {
-			try {
-				this.annotationZipFile = reader.setExternalAnnotationProvider(this.externalAnnotationPath, fileNameWithoutExtension, this.annotationZipFile, null);
-			} catch (@SuppressWarnings("unused") IOException e) {
-				// don't let error on annotations fail class reading
-			}
+// BH 2018 photon doesn't allow this 			
+//			try {
+//				this.annotationZipFile = reader.setExternalAnnotationProvider(this.externalAnnotationPath, fileNameWithoutExtension, this.annotationZipFile, null);
+//			} catch (@SuppressWarnings("unused") IOException e) {
+//				// don't let error on annotations fail class reading
+//			}
 		}
 		if (this.accessRuleSet == null)
 			return new NameEnvironmentAnswer(reader, null);
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/builder/ClasspathJar.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/builder/ClasspathJar.java
@@ -169,11 +169,12 @@ public NameEnvironmentAnswer findClass(String binaryFileName, String qualifiedPa
 		if (reader != null) {
 			String fileNameWithoutExtension = qualifiedBinaryFileName.substring(0, qualifiedBinaryFileName.length() - SuffixConstants.SUFFIX_CLASS.length);
 			if (this.externalAnnotationPath != null) {
-				try {
-					this.annotationZipFile = reader.setExternalAnnotationProvider(this.externalAnnotationPath, fileNameWithoutExtension, this.annotationZipFile, null);
-				} catch (@SuppressWarnings("unused") IOException e) {
-					// don't let error on annotations fail class reading
-				}
+				// photon doesn't allow this
+//				try {
+//					this.annotationZipFile = reader.setExternalAnnotationProvider(this.externalAnnotationPath, fileNameWithoutExtension, this.annotationZipFile, null);
+//				} catch (@SuppressWarnings("unused") IOException e) {
+//					// don't let error on annotations fail class reading
+//				}
 			}
 			if (this.accessRuleSet == null)
 				return new NameEnvironmentAnswer(reader, null);
