7090700: fix for 7080267 breaks two tests

Wed, 14 Sep 2011 15:49:54 -0700

author
jjg
date
Wed, 14 Sep 2011 15:49:54 -0700
changeset 1091
a6e2c1840ea1
parent 1090
1807fc3fd33c
child 1092
826ae6a2f27d

7090700: fix for 7080267 breaks two tests
Reviewed-by: ksrini

src/share/classes/com/sun/tools/javac/tree/JCTree.java file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Wed Sep 14 12:14:30 2011 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Wed Sep 14 15:49:54 2011 -0700
     1.3 @@ -538,21 +538,6 @@
     1.4              super.setPos(pos);
     1.5              return this;
     1.6          }
     1.7 -
     1.8 -        /** Convert a statement tree to a pretty-printed string. */
     1.9 -        @Override
    1.10 -        public String toString() {
    1.11 -            StringWriter s = new StringWriter();
    1.12 -            try {
    1.13 -                new Pretty(s, false).printStat(this);
    1.14 -            }
    1.15 -            catch (IOException e) {
    1.16 -                // should never happen, because StringWriter is defined
    1.17 -                // never to throw any IOExceptions
    1.18 -                throw new AssertionError(e);
    1.19 -            }
    1.20 -            return s.toString();
    1.21 -        }
    1.22      }
    1.23  
    1.24      public static abstract class JCExpression extends JCTree implements ExpressionTree {
    1.25 @@ -1191,6 +1176,21 @@
    1.26          public int getTag() {
    1.27              return EXEC;
    1.28          }
    1.29 +
    1.30 +        /** Convert a expression-statement tree to a pretty-printed string. */
    1.31 +        @Override
    1.32 +        public String toString() {
    1.33 +            StringWriter s = new StringWriter();
    1.34 +            try {
    1.35 +                new Pretty(s, false).printStat(this);
    1.36 +            }
    1.37 +            catch (IOException e) {
    1.38 +                // should never happen, because StringWriter is defined
    1.39 +                // never to throw any IOExceptions
    1.40 +                throw new AssertionError(e);
    1.41 +            }
    1.42 +            return s.toString();
    1.43 +        }
    1.44      }
    1.45  
    1.46      /**

mercurial