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

     1.1 --- a/test/tools/javac/annotations/repeatingAnnotations/combo/DeprecatedAnnoCombo.java	Mon Jan 14 19:52:36 2013 +0100
     1.2 +++ b/test/tools/javac/annotations/repeatingAnnotations/combo/DeprecatedAnnoCombo.java	Mon Jan 14 13:50:01 2013 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -115,24 +115,21 @@
    1.11          switch(className) {
    1.12          case "DeprecatedonBoth":
    1.13              annoData.append(Helper.ContentVars.DEPRECATED.getVal())
    1.14 -                    .append(Helper.ContentVars.CONTAINERFOR.getVal())
    1.15                      .append(Helper.ContentVars.CONTAINER.getVal())
    1.16                      .append(Helper.ContentVars.DEPRECATED.getVal())
    1.17 -                    .append(Helper.ContentVars.CONTAINEDBY.getVal())
    1.18 +                    .append(Helper.ContentVars.REPEATABLE.getVal())
    1.19                      .append(Helper.ContentVars.BASE.getVal());
    1.20              break;
    1.21          case "DeprecatedonBase":
    1.22 -            annoData.append(Helper.ContentVars.CONTAINERFOR.getVal())
    1.23 -                    .append(Helper.ContentVars.CONTAINER.getVal())
    1.24 +            annoData.append(Helper.ContentVars.CONTAINER.getVal())
    1.25                      .append(Helper.ContentVars.DEPRECATED.getVal())
    1.26 -                    .append(Helper.ContentVars.CONTAINEDBY.getVal())
    1.27 +                    .append(Helper.ContentVars.REPEATABLE.getVal())
    1.28                      .append(Helper.ContentVars.BASE.getVal());
    1.29              break;
    1.30          case "DeprecatedonContainer":
    1.31              annoData.append(Helper.ContentVars.DEPRECATED.getVal())
    1.32 -                    .append(Helper.ContentVars.CONTAINERFOR.getVal())
    1.33                      .append(Helper.ContentVars.CONTAINER.getVal())
    1.34 -                    .append(Helper.ContentVars.CONTAINEDBY.getVal())
    1.35 +                    .append(Helper.ContentVars.REPEATABLE.getVal())
    1.36                      .append(Helper.ContentVars.BASE.getVal());
    1.37              break;
    1.38          }