src/share/classes/javax/lang/model/util/ElementScanner6.java

*** 150,205 ****
      }
  
      /**
       * {@inheritDoc} This implementation scans the enclosed elements.
       *
!      * @param e  the element to visit
!      * @param p  a visitor-specified parameter
       * @return the result of scanning
       */
      public R visitPackage(PackageElement e, P p) {
          return scan(e.getEnclosedElements(), p);
      }
  
      /**
       * {@inheritDoc} This implementation scans the enclosed elements.
       *
!      * @param e  the element to visit
!      * @param p  a visitor-specified parameter
       * @return the result of scanning
       */
      public R visitType(TypeElement e, P p) {
          return scan(e.getEnclosedElements(), p);
      }
  
      /**
!      * {@inheritDoc} This implementation scans the enclosed elements.
       *
!      * @param e  the element to visit
!      * @param p  a visitor-specified parameter
       * @return the result of scanning
       */
      public R visitVariable(VariableElement e, P p) {
          return scan(e.getEnclosedElements(), p);
      }
  
      /**
       * {@inheritDoc} This implementation scans the parameters.
       *
!      * @param e  the element to visit
!      * @param p  a visitor-specified parameter
       * @return the result of scanning
       */
      public R visitExecutable(ExecutableElement e, P p) {
          return scan(e.getParameters(), p);
      }
  
      /**
       * {@inheritDoc} This implementation scans the enclosed elements.
       *
!      * @param e  the element to visit
!      * @param p  a visitor-specified parameter
       * @return the result of scanning
       */
      public R visitTypeParameter(TypeParameterElement e, P p) {
          return scan(e.getEnclosedElements(), p);
      }
--- 150,212 ----
      }
  
      /**
       * {@inheritDoc} This implementation scans the enclosed elements.
       *
!      * @param e  {@inheritDoc}
!      * @param p  {@inheritDoc}
       * @return the result of scanning
       */
      public R visitPackage(PackageElement e, P p) {
          return scan(e.getEnclosedElements(), p);
      }
  
      /**
       * {@inheritDoc} This implementation scans the enclosed elements.
       *
!      * @param e  {@inheritDoc}
!      * @param p  {@inheritDoc}
       * @return the result of scanning
       */
      public R visitType(TypeElement e, P p) {
          return scan(e.getEnclosedElements(), p);
      }
  
      /**
!      * {@inheritDoc}
!      *
!      * This implementation scans the enclosed elements, unless the
!      * element is a {@code RESOURCE_VARIABLE} in which case {@code
!      * visitUnknown} is called.
       *
!      * @param e  {@inheritDoc}
!      * @param p  {@inheritDoc}
       * @return the result of scanning
       */
      public R visitVariable(VariableElement e, P p) {
+         if (e.getKind() != ElementKind.RESOURCE_VARIABLE)
              return scan(e.getEnclosedElements(), p);
+         else
+             return visitUnknown(e, p);
      }
  
      /**
       * {@inheritDoc} This implementation scans the parameters.
       *
!      * @param e  {@inheritDoc}
!      * @param p  {@inheritDoc}
       * @return the result of scanning
       */
      public R visitExecutable(ExecutableElement e, P p) {
          return scan(e.getParameters(), p);
      }
  
      /**
       * {@inheritDoc} This implementation scans the enclosed elements.
       *
!      * @param e  {@inheritDoc}
!      * @param p  {@inheritDoc}
       * @return the result of scanning
       */
      public R visitTypeParameter(TypeParameterElement e, P p) {
          return scan(e.getEnclosedElements(), p);
      }