# HG changeset patch
# User duke
# Date 1499265911 -7200
# Node ID b144aadaeb0ddc66fd10a3c62bb570928da63e93
# Parent a02ba404f9c6800481640eb26c163d940a23c436# Parent 637e3c4c99f8839f991e10f736ff82783284a7f2
Merge
diff -r 637e3c4c99f8 -r b144aadaeb0d langtools/.hgtags
--- a/langtools/.hgtags Wed Jul 05 16:45:08 2017 +0200
+++ b/langtools/.hgtags Wed Jul 05 16:45:11 2017 +0200
@@ -16,3 +16,4 @@
3fb51e47622bb771571680bc6a7b64c6172b482d jdk7-b39
32e30988324601d08b87989f0821d99aa8534511 jdk7-b40
ded6b40f558e8d19b3c17715b3d67ee001606645 jdk7-b41
+5e5567c2db56a931cf07768218c20903d9828b5f jdk7-b42
diff -r 637e3c4c99f8 -r b144aadaeb0d langtools/test/com/sun/javadoc/testSourceTab/DoubleTab/C.java
--- a/langtools/test/com/sun/javadoc/testSourceTab/DoubleTab/C.java Wed Jul 05 16:45:08 2017 +0200
+++ b/langtools/test/com/sun/javadoc/testSourceTab/DoubleTab/C.java Wed Jul 05 16:45:11 2017 +0200
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,15 +23,15 @@
/**
*
- * This source
- * is indented
- * with tabs.
+ * \t\tThis source
+ * \t\tis indented
+ * \t\twith tabs.
*
*/
public class C {
-
- //This source
- //is indented
- //with tabs.
-
+
+\t\t//This source
+\t\t//is indented
+\t\t//with tabs.
+
}
diff -r 637e3c4c99f8 -r b144aadaeb0d langtools/test/com/sun/javadoc/testSourceTab/SingleTab/C.java
--- a/langtools/test/com/sun/javadoc/testSourceTab/SingleTab/C.java Wed Jul 05 16:45:08 2017 +0200
+++ b/langtools/test/com/sun/javadoc/testSourceTab/SingleTab/C.java Wed Jul 05 16:45:11 2017 +0200
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,15 +23,15 @@
/**
*
- * This source
- * is indented
- * with tabs.
+ *\tThis source
+ * \tis indented
+ * \twith tabs.
*
*/
public class C {
-
- //This source
- //is indented
- //with tabs.
-
+
+\t//This source
+\t//is indented
+\t//with tabs.
+
}
diff -r 637e3c4c99f8 -r b144aadaeb0d langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java
--- a/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java Wed Jul 05 16:45:08 2017 +0200
+++ b/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java Wed Jul 05 16:45:11 2017 +0200
@@ -1,5 +1,5 @@
-/*
- * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved.
+/*
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
@@ -33,59 +33,102 @@
* @run main TestSourceTab
*/
+import java.io.*;
+
public class TestSourceTab extends JavadocTester {
-
+
private static final String BUG_ID = "4510979";
+ private static final String TMP_SRC_DIR = "tmpSrc";
private static final String OUTPUT_DIR1 = BUG_ID + "-tabLengthEight";
private static final String OUTPUT_DIR2 = BUG_ID + "-tabLengthFour";
private static final String[][] TEST = NO_TEST;
private static final String[][] NEGATED_TEST = NO_TEST;
-
+
//Run Javadoc on a source file with that is indented with a single tab per line
private static final String[] ARGS1 =
new String[] {
- "-d", OUTPUT_DIR1, "-sourcepath", SRC_DIR,
- "-notimestamp", "-linksource", SRC_DIR + FS + "SingleTab" + FS + "C.java"
+ "-d", OUTPUT_DIR1, "-sourcepath", TMP_SRC_DIR,
+ "-notimestamp", "-linksource", TMP_SRC_DIR + FS + "SingleTab" + FS + "C.java"
};
-
+
//Run Javadoc on a source file with that is indented with a two tab per line
//If we double the tabs and decrease the tab length by a half, the output should
//be the same as the one generated above.
private static final String[] ARGS2 =
new String[] {
- "-d", OUTPUT_DIR2, "-sourcepath", SRC_DIR,
- "-notimestamp", "-sourcetab", "4", SRC_DIR + FS + "DoubleTab" + FS + "C.java"
+ "-d", OUTPUT_DIR2, "-sourcepath", TMP_SRC_DIR,
+ "-notimestamp", "-sourcetab", "4", TMP_SRC_DIR + FS + "DoubleTab" + FS + "C.java"
};
-
+
//Files to diff
private static final String[][] FILES_TO_DIFF = {
{OUTPUT_DIR1 + FS + "src-html" + FS + "C.html",
OUTPUT_DIR2 + FS + "src-html" + FS + "C.html"
- },
+ },
{OUTPUT_DIR1 + FS + "C.html",
OUTPUT_DIR2 + FS + "C.html"
}
-
+
};
-
+
/**
* The entry point of the test.
* @param args the array of command line arguments.
*/
- public static void main(String[] args) {
+ public static void main(String[] args) throws IOException {
TestSourceTab tester = new TestSourceTab();
run(tester, ARGS1, TEST, NEGATED_TEST);
run(tester, ARGS2, TEST, NEGATED_TEST);
tester.runDiffs(FILES_TO_DIFF);
}
-
+
+ TestSourceTab() throws IOException {
+ initTabs(new File(SRC_DIR), new File(TMP_SRC_DIR));
+ }
+
+ void initTabs(File from, File to) throws IOException {
+ for (File f: from.listFiles()) {
+ File t = new File(to, f.getName());
+ if (f.isDirectory()) {
+ initTabs(f, t);
+ } else if (f.getName().endsWith(".java")) {
+ write(t, read(f).replace("\\t", "\t"));
+ }
+ }
+ }
+
+ String read(File f) throws IOException {
+ StringBuilder sb = new StringBuilder();
+ BufferedReader in = new BufferedReader(new FileReader(f));
+ try {
+ String line;
+ while ((line = in.readLine()) != null) {
+ sb.append(line);
+ sb.append("\n");
+ }
+ } finally {
+ in.close();
+ }
+ return sb.toString();
+ }
+
+ void write(File f, String s) throws IOException {
+ f.getParentFile().mkdirs();
+ Writer out = new FileWriter(f);
+ try {
+ out.write(s);
+ } finally {
+ out.close();
+ }
+ }
+
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
-
+
/**
* {@inheritDoc}
*/