Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java	Thu Sep 26 10:43:28 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java	Fri Oct 04 16:21:34 2013 +0100
     1.3 @@ -23,7 +23,7 @@
     1.4   * questions.
     1.5   */
     1.6  /*
     1.7 - * Copyright (C) 2004-2011
     1.8 + * Copyright (C) 2004-2012
     1.9   *
    1.10   * Permission is hereby granted, free of charge, to any person obtaining a copy
    1.11   * of this software and associated documentation files (the "Software"), to deal
    1.12 @@ -65,17 +65,25 @@
    1.13      A extends Annotations<E,L,CL>,
    1.14      CL extends CommentList<L>> implements NameClassBuilder<NameClass,E,L,A,CL> {
    1.15  
    1.16 +    @Override
    1.17      public NameClass makeChoice(List<NameClass> nameClasses, L loc, A anno) {
    1.18 -      NameClass result = nameClasses.get(0);
    1.19 -      for (int i = 1; i < nameClasses.size(); i++)
    1.20 -        result = new ChoiceNameClass(result, nameClasses.get(i));
    1.21 -      return result;
    1.22 +        NameClass result = nameClasses.get(0);
    1.23 +        for (int i = 1; i < nameClasses.size(); i++) {
    1.24 +            result = new ChoiceNameClass(result, nameClasses.get(i));
    1.25 +        }
    1.26 +        return result;
    1.27      }
    1.28  
    1.29 +    @Override
    1.30      public NameClass makeName(String ns, String localName, String prefix, L loc, A anno) {
    1.31 -      return new SimpleNameClass(ns, localName);
    1.32 +        if (prefix == null) {
    1.33 +            return new SimpleNameClass(ns, localName);
    1.34 +        } else {
    1.35 +            return new SimpleNameClass(ns, localName, prefix);
    1.36 +        }
    1.37      }
    1.38  
    1.39 +    @Override
    1.40      public NameClass makeNsName(String ns, L loc, A anno) {
    1.41        return new NsNameClass(ns);
    1.42      }