# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1370362261 -7200
# Node ID 9006bc30a951073378f0412f5fb9e9c2e8641edd
# Parent  063a712fe8d8a4eccce1edcd14fc40c4f7fc75a3
add all enclosing elements of an annotated field as originating elements

diff -r 063a712fe8d8 -r 9006bc30a951 graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java
--- a/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java	Tue Jun 04 17:33:14 2013 +0200
+++ b/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java	Tue Jun 04 18:11:01 2013 +0200
@@ -106,7 +106,10 @@
         Element enclosing = element.getEnclosingElement();
         String declaringClass = "";
         String separator = "";
+        List<Element> originatingElementsList = new ArrayList<>();
+        originatingElementsList.add(field);
         while (enclosing != null) {
+            originatingElementsList.add(enclosing);
             if (enclosing.getKind() == ElementKind.CLASS || enclosing.getKind() == ElementKind.INTERFACE) {
                 if (enclosing.getModifiers().contains(Modifier.PRIVATE)) {
                     String msg = String.format("Option field cannot be declared in a private %s %s", enclosing.getKind().name().toLowerCase(), enclosing);
@@ -123,9 +126,10 @@
         }
 
         String providerClassName = declaringClass.replace('.', '_') + "_" + fieldName;
+        Element[] originatingElements = originatingElementsList.toArray(new Element[originatingElementsList.size()]);
 
         Filer filer = processingEnv.getFiler();
-        try (PrintWriter out = createSourceFile(element, pkg, providerClassName, filer)) {
+        try (PrintWriter out = createSourceFile(pkg, providerClassName, filer, originatingElements)) {
 
             out.println("/*");
             out.println(" * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.");
@@ -185,24 +189,24 @@
         }
 
         try {
-            createProviderFile(field, pkg, providerClassName);
+            createProviderFile(pkg, providerClassName, originatingElements);
         } catch (IOException e) {
             processingEnv.getMessager().printMessage(Kind.ERROR, e.getMessage(), field);
         }
     }
 
-    private void createProviderFile(Element field, String pkg, String providerClassName) throws IOException {
+    private void createProviderFile(String pkg, String providerClassName, Element... originatingElements) throws IOException {
         String filename = "META-INF/providers/" + pkg + "." + providerClassName;
-        FileObject file = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", filename, field);
+        FileObject file = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", filename, originatingElements);
         PrintWriter writer = new PrintWriter(new OutputStreamWriter(file.openOutputStream(), "UTF-8"));
         writer.println(OptionProvider.class.getName());
         writer.close();
     }
 
-    protected PrintWriter createSourceFile(Element element, String pkg, String relativeName, Filer filer) {
+    protected PrintWriter createSourceFile(String pkg, String relativeName, Filer filer, Element... originatingElements) {
         try {
             // Ensure Unix line endings to comply with Graal code style guide checked by Checkstyle
-            JavaFileObject sourceFile = filer.createSourceFile(pkg + "." + relativeName, element);
+            JavaFileObject sourceFile = filer.createSourceFile(pkg + "." + relativeName, originatingElements);
             return new PrintWriter(sourceFile.openWriter()) {
 
                 @Override