jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java

-:d0257833498e
+:f85d980faaf8
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import javax.lang.model.element.NestingKind;
 import javax.tools.Diagnostic;
 import com.sun.source.util.TaskEvent;
 import com.sun.source.util.TaskListener;
 import com.sun.tools.javac.util.ClientCodeException;
 import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.JCDiagnostic;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import javax.lang.model.element.Modifier;
 return ((JavaFileObject) ((WrappedJavaFileObject) fo).clientFileObject);
 else
 return fo;
 }
-<T> DiagnosticListener<T> wrap(DiagnosticListener<T> dl) {
+<T /*super JavaFileOject*/> DiagnosticListener<T> wrap(DiagnosticListener<T> dl) {
 if (isTrusted(dl))
 return dl;
 return new WrappedDiagnosticListener<T>(dl);
 }
 TaskListener wrap(TaskListener tl) {
 if (isTrusted(tl))
 return tl;
 return new WrappedTaskListener(tl);
+}
+@SuppressWarnings("unchecked")
+private <T> Diagnostic<T> unwrap(final Diagnostic<T> diagnostic) {
+if (diagnostic instanceof JCDiagnostic) {
+JCDiagnostic d = (JCDiagnostic) diagnostic;
+return (Diagnostic<T>) new DiagnosticSourceUnwrapper(d);
+} else {
+return diagnostic;
+}
 }
 protected boolean isTrusted(Object o) {
 Class<?> c = o.getClass();
 Boolean trusted = trustedClasses.get(c);
 throw new ClientCodeException(e);
 }
 }
 }
-protected class WrappedDiagnosticListener<T> implements DiagnosticListener<T> {
+protected class WrappedDiagnosticListener<T /*super JavaFileObject*/> implements DiagnosticListener<T> {
 protected DiagnosticListener<T> clientDiagnosticListener;
 WrappedDiagnosticListener(DiagnosticListener<T> clientDiagnosticListener) {
 clientDiagnosticListener.getClass(); // null check
 this.clientDiagnosticListener = clientDiagnosticListener;
 }
 @Override
 public void report(Diagnostic<? extends T> diagnostic) {
 try {
-clientDiagnosticListener.report(diagnostic);
+clientDiagnosticListener.report(unwrap(diagnostic));
 } catch (ClientCodeException e) {
 throw e;
 } catch (RuntimeException e) {
 throw new ClientCodeException(e);
 } catch (Error e) {
 throw new ClientCodeException(e);
 }
+}
+}
+public class DiagnosticSourceUnwrapper implements Diagnostic<JavaFileObject> {
+public final JCDiagnostic d;
+DiagnosticSourceUnwrapper(JCDiagnostic d) {
+this.d = d;
+}
+public Diagnostic.Kind getKind() {
+return d.getKind();
+}
+public JavaFileObject getSource() {
+return unwrap(d.getSource());
+}
+public long getPosition() {
+return d.getPosition();
+}
+public long getStartPosition() {
+return d.getStartPosition();
+}
+public long getEndPosition() {
+return d.getEndPosition();
+}
+public long getLineNumber() {
+return d.getLineNumber();
+}
+public long getColumnNumber() {
+return d.getColumnNumber();
+}
+public String getCode() {
+return d.getCode();
+}
+public String getMessage(Locale locale) {
+return d.getMessage(locale);
 }
 }
 protected class WrappedTaskListener implements TaskListener {
 protected TaskListener clientTaskListener;

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java

src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java