src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java

rev 472 : 8036030: Update JAX-WS RI integration to latest version

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 63,73 ****
   * {@link Navigator} implementation for annotation processing.
   * TODO: check the spec on how generics are supposed to be handled
   *
   * @author Kohsuke Kawaguchi (kk@kohsuke.org)
   */
! public class ApNavigator implements Navigator<TypeMirror, TypeElement, VariableElement, ExecutableElement> {
  
      private final ProcessingEnvironment env;
  
      private final PrimitiveType primitiveByte;
  
--- 63,73 ----
   * {@link Navigator} implementation for annotation processing.
   * TODO: check the spec on how generics are supposed to be handled
   *
   * @author Kohsuke Kawaguchi (kk@kohsuke.org)
   */
! public final class ApNavigator implements Navigator<TypeMirror, TypeElement, VariableElement, ExecutableElement> {
  
      private final ProcessingEnvironment env;
  
      private final PrimitiveType primitiveByte;
  
*** 234,244 ****
      public boolean isAbstract(TypeElement clazz) {
          return hasModifier(clazz,Modifier.ABSTRACT);
      }
  
      public boolean isFinal(TypeElement clazz) {
!         return hasModifier(clazz,Modifier.FINAL);
      }
  
      public VariableElement[] getEnumConstants(TypeElement clazz) {
          List<? extends Element> elements = env.getElementUtils().getAllMembers(clazz);
          Collection<VariableElement> constants = new HashSet<VariableElement>();
--- 234,244 ----
      public boolean isAbstract(TypeElement clazz) {
          return hasModifier(clazz,Modifier.ABSTRACT);
      }
  
      public boolean isFinal(TypeElement clazz) {
!         return hasModifier(clazz, Modifier.FINAL);
      }
  
      public VariableElement[] getEnumConstants(TypeElement clazz) {
          List<? extends Element> elements = env.getElementUtils().getAllMembers(clazz);
          Collection<VariableElement> constants = new HashSet<VariableElement>();
*** 256,267 ****
  
      public String getPackageName(TypeElement clazz) {
          return env.getElementUtils().getPackageOf(clazz).getQualifiedName().toString();
      }
  
!     public TypeElement findClass(String className, TypeElement referencePoint) {
!         return env.getElementUtils().getTypeElement(className);
      }
  
      public boolean isBridgeMethod(ExecutableElement method) {
          return method.getModifiers().contains(Modifier.VOLATILE);
      }
--- 256,268 ----
  
      public String getPackageName(TypeElement clazz) {
          return env.getElementUtils().getPackageOf(clazz).getQualifiedName().toString();
      }
  
!     @Override
!     public TypeElement loadObjectFactory(TypeElement referencePoint, String packageName) {
!         return env.getElementUtils().getTypeElement(packageName + ".ObjectFactory");
      }
  
      public boolean isBridgeMethod(ExecutableElement method) {
          return method.getModifiers().contains(Modifier.VOLATILE);
      }