changeset 15036:b60e18ab9dd7

8005647: langtools/test/tools/javap/MethodParameters.java fails on windows Summary: Fix javap to not output \r\r\n Reviewed-by: jjg
author jjh
date Mon, 07 Jan 2013 17:51:05 +0000
parents d03c311f44e6
children 8ba16ac61b1a
files langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java langtools/test/tools/javac/MethodParameters.java langtools/test/tools/javap/MethodParameters.java
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java	Sat Jan 05 00:55:53 2013 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java	Mon Jan 07 17:51:05 2013 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -206,7 +206,7 @@
             println("minor version: " + cf.minor_version);
             println("major version: " + cf.major_version);
             if (!options.compat)
-              writeList("flags: ", flags.getClassFlags(), NEWLINE);
+              writeList("flags: ", flags.getClassFlags(), "\n");
             indent(-1);
             constantWriter.writeConstantPool();
         } else {
@@ -383,7 +383,7 @@
             println("Signature: " + getValue(f.descriptor));
 
         if (options.verbose && !options.compat)
-            writeList("flags: ", flags.getFieldFlags(), NEWLINE);
+            writeList("flags: ", flags.getFieldFlags(), "\n");
 
         if (options.showAllAttrs) {
             for (Attribute attr: f.attributes)
@@ -480,7 +480,7 @@
         }
 
         if (options.verbose && !options.compat) {
-            writeList("flags: ", flags.getMethodFlags(), NEWLINE);
+            writeList("flags: ", flags.getMethodFlags(), "\n");
         }
 
         Code_attribute code = null;
@@ -749,5 +749,4 @@
     private int size;
     private ConstantPool constant_pool;
     private Method method;
-    private static final String NEWLINE = System.getProperty("line.separator", "\n");
 }
--- a/langtools/test/tools/javac/MethodParameters.java	Sat Jan 05 00:55:53 2013 -0800
+++ b/langtools/test/tools/javac/MethodParameters.java	Mon Jan 07 17:51:05 2013 +0000
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8004727
  * @summary javac should generate method parameters correctly.
  */
 // key: opt.arg.parameters
--- a/langtools/test/tools/javap/MethodParameters.java	Sat Jan 05 00:55:53 2013 -0800
+++ b/langtools/test/tools/javap/MethodParameters.java	Mon Jan 07 17:51:05 2013 +0000
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8004727 8005647
  * @summary javac should generate method parameters correctly.
  */