Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml	Tue Sep 08 11:12:13 2009 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml	Tue Sep 08 11:29:58 2009 -0700
     1.3 @@ -1,7 +1,7 @@
     1.4  <?xml version='1.0' encoding='utf-8'?>
     1.5  
     1.6  <!--
     1.7 - Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
     1.8 + Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
     1.9   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    1.10  
    1.11   This code is free software; you can redistribute it and/or modify it
    1.12 @@ -44,7 +44,7 @@
    1.13          <PackageTags/>
    1.14          <PackageFooter/>
    1.15      </PackageDoc>
    1.16 -    
    1.17 +
    1.18      <AnnotationTypeDoc>
    1.19          <AnnotationTypeHeader/>
    1.20          <DeprecationInfo/>
    1.21 @@ -52,7 +52,7 @@
    1.22          <AnnotationTypeDescription/>
    1.23          <AnnotationTypeTagInfo/>
    1.24          <MemberSummary>
    1.25 -        	<AnnotationTypeRequiredMemberSummary/>
    1.26 +                <AnnotationTypeRequiredMemberSummary/>
    1.27              <AnnotationTypeOptionalMemberSummary/>
    1.28          </MemberSummary>
    1.29          <AnnotationTypeRequiredMemberDetails>
    1.30 @@ -77,16 +77,16 @@
    1.31                  <MemberFooter/>
    1.32              </AnnotationTypeOptionalMember>
    1.33              <Footer/>
    1.34 -        </AnnotationTypeOptionalMemberDetails>        
    1.35 +        </AnnotationTypeOptionalMemberDetails>
    1.36          <AnnotationTypeFooter/>
    1.37      </AnnotationTypeDoc>
    1.38 -    
    1.39 +
    1.40      <ClassDoc>
    1.41          <ClassHeader/>
    1.42          <ClassTree/>
    1.43          <TypeParamInfo/>
    1.44          <SuperInterfacesInfo/>
    1.45 -        <ImplementedInterfacesInfo/>        
    1.46 +        <ImplementedInterfacesInfo/>
    1.47          <SubClassInfo/>
    1.48          <SubInterfacesInfo/>
    1.49          <InterfaceUsageInfo/>
    1.50 @@ -100,7 +100,7 @@
    1.51              <NestedClassesInheritedSummary/>
    1.52              <EnumConstantsSummary/>
    1.53              <FieldsSummary/>
    1.54 -            <FieldsInheritedSummary/>  
    1.55 +            <FieldsInheritedSummary/>
    1.56              <ConstructorsSummary/>
    1.57              <MethodsSummary/>
    1.58              <MethodsInheritedSummary/>
    1.59 @@ -155,7 +155,7 @@
    1.60          </MethodDetails>
    1.61          <ClassFooter/>
    1.62      </ClassDoc>
    1.63 -    
    1.64 +
    1.65      <ConstantSummary>
    1.66          <Header/>
    1.67          <Contents/>
    1.68 @@ -166,12 +166,12 @@
    1.69                      <ClassHeader/>
    1.70                      <ConstantMembers/>
    1.71                      <ClassFooter/>
    1.72 -                </ClassConstantSummary>     
    1.73 +                </ClassConstantSummary>
    1.74              </PackageConstantSummary>
    1.75 -        </ConstantSummaries>    
    1.76 +        </ConstantSummaries>
    1.77          <Footer/>
    1.78      </ConstantSummary>
    1.79 -    
    1.80 +
    1.81      <SerializedForm>
    1.82          <Header/>
    1.83          <SerializedFormSummaries>

     2.1 --- a/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java	Tue Sep 08 11:12:13 2009 -0700
     2.2 +++ b/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java	Tue Sep 08 11:29:58 2009 -0700
     2.3 @@ -32,6 +32,9 @@
     2.4   * @run main TestCRLineSeparator
     2.5   */
     2.6  
     2.7 +import java.io.*;
     2.8 +import java.util.*;
     2.9 +
    2.10  public class TestCRLineSeparator extends JavadocTester {
    2.11  
    2.12      //Test information.
    2.13 @@ -39,7 +42,7 @@
    2.14  
    2.15      //Javadoc arguments.
    2.16      private static final String[] ARGS = new String[] {
    2.17 -        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
    2.18 +        "-d", BUG_ID, "-sourcepath", ".", "pkg"
    2.19      };
    2.20  
    2.21      //Input for string search tests.
    2.22 @@ -53,7 +56,8 @@
    2.23       * The entry point of the test.
    2.24       * @param args the array of command line arguments.
    2.25       */
    2.26 -    public static void main(String[] args) {
    2.27 +    public static void main(String[] args) throws Exception {
    2.28 +        initFiles(new File(SRC_DIR), new File("."), "pkg");
    2.29          TestCRLineSeparator tester = new TestCRLineSeparator();
    2.30          run(tester, ARGS, TEST, NEGATED_TEST);
    2.31          tester.printSummary();
    2.32 @@ -72,4 +76,36 @@
    2.33      public String getBugName() {
    2.34          return getClass().getName();
    2.35      }
    2.36 +
    2.37 +    // recursively copy files from fromDir to toDir, replacing newlines
    2.38 +    // with \r
    2.39 +    static void initFiles(File fromDir, File toDir, String f) throws IOException {
    2.40 +        File from_f = new File(fromDir, f);
    2.41 +        File to_f = new File(toDir, f);
    2.42 +        if (from_f.isDirectory()) {
    2.43 +            to_f.mkdirs();
    2.44 +            for (String child: from_f.list()) {
    2.45 +                initFiles(from_f, to_f, child);
    2.46 +            }
    2.47 +        } else {
    2.48 +            List<String> lines = new ArrayList<String>();
    2.49 +            BufferedReader in = new BufferedReader(new FileReader(from_f));
    2.50 +            try {
    2.51 +                String line;
    2.52 +                while ((line = in.readLine()) != null)
    2.53 +                    lines.add(line);
    2.54 +            } finally {
    2.55 +                in.close();
    2.56 +            }
    2.57 +            BufferedWriter out = new BufferedWriter(new FileWriter(to_f));
    2.58 +            try {
    2.59 +                for (String line: lines) {
    2.60 +                    out.write(line);
    2.61 +                    out.write("\r");
    2.62 +                }
    2.63 +            } finally {
    2.64 +                out.close();
    2.65 +            }
    2.66 +        }
    2.67 +    }
    2.68  }

     3.1 --- a/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java	Tue Sep 08 11:12:13 2009 -0700
     3.2 +++ b/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java	Tue Sep 08 11:29:58 2009 -0700
     3.3 @@ -21,4 +21,11 @@
     3.4   * have any questions.
     3.5   */
     3.6  
     3.7 -package pkg;
     3.8 
     3.9 /**
    3.10  * Line 1
    3.11  * Line 2
    3.12  */
    3.13 public class MyClass {}
    3.14 +package pkg;
    3.15 +
    3.16 +/**
    3.17 + * Line 1
    3.18 + * Line 2
    3.19 + */
    3.20 +public class MyClass {}
    3.21 +

     4.1 --- a/test/com/sun/javadoc/testHref/package-list	Tue Sep 08 11:12:13 2009 -0700
     4.2 +++ b/test/com/sun/javadoc/testHref/package-list	Tue Sep 08 11:29:58 2009 -0700
     4.3 @@ -1,1 +1,1 @@
     4.4 -java.lang
     4.5 +java.lang

     5.1 --- a/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html	Tue Sep 08 11:12:13 2009 -0700
     5.2 +++ b/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html	Tue Sep 08 11:29:58 2009 -0700
     5.3 @@ -1,6 +1,6 @@
     5.4 -<html>
     5.5 -<body>
     5.6 -{@link java.awt.Color#getAlpha()
     5.7 -getAlpha}
     5.8 -</body>
     5.9 -</html>
    5.10 +<html>
    5.11 +<body>
    5.12 +{@link java.awt.Color#getAlpha()
    5.13 +getAlpha}
    5.14 +</body>
    5.15 +</html>

     6.1 --- a/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java	Tue Sep 08 11:12:13 2009 -0700
     6.2 +++ b/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java	Tue Sep 08 11:29:58 2009 -0700
     6.3 @@ -52,7 +52,7 @@
     6.4          TestNoPackagesFile tester = new TestNoPackagesFile();
     6.5          run(tester, ARGS, NO_TEST, NO_TEST);
     6.6          if ((new java.io.File(BUG_ID + FS + "packages.html")).exists()) {
     6.7 -            throw new Error("Test Fails: packages file should not be " +
     6.8                 "generated anymore.");
     6.9 +            throw new Error("Test Fails: packages file should not be " +                "generated anymore.");
    6.10          } else {
    6.11              System.out.println("Test passes:  packages.html not found.");
    6.12          }

     7.1 --- a/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Tue Sep 08 11:12:13 2009 -0700
     7.2 +++ b/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Tue Sep 08 11:29:58 2009 -0700
     7.3 @@ -46,7 +46,7 @@
     7.4      //Method foo() is inherited from BOTH I2 and I3
     7.5      private static final String[][] TEST = {
     7.6         {BUG_ID + FS + "pkg3" + FS + "I1.html",
     7.7 -        "Methods inherited from interface pkg3." +
     7.8         "<A HREF=\"../pkg3/I2.html\" title=\"interface in pkg3\">I2</A>"},
     7.9 +        "Methods inherited from interface pkg3." +        "<A HREF=\"../pkg3/I2.html\" title=\"interface in pkg3\">I2</A>"},
    7.10          {BUG_ID + FS + "pkg3" + FS +"I1.html",
    7.11          "Methods inherited from interface pkg3." +
    7.12          "<A HREF=\"../pkg3/I3.html\" title=\"interface in pkg3\">I3</A>"},

     8.1 --- a/test/com/sun/javadoc/testRelativeLinks/pkg/package.html	Tue Sep 08 11:12:13 2009 -0700
     8.2 +++ b/test/com/sun/javadoc/testRelativeLinks/pkg/package.html	Tue Sep 08 11:29:58 2009 -0700
     8.3 @@ -1,6 +1,7 @@
     8.4 -<html>
     8.5 -	<body>
     8.6 -		Here is a relative link in a package: 
     8.7 -       <a href="relative-package-link.html">relative package link</a>.
     8.8 -	</body>
     8.9 -</html>
    8.10 \ No newline at end of file
    8.11 +<html>
    8.12 +	<body>
    8.13 +		Here is a relative link in a package: 
    8.14 +       <a href="relative-package-link.html">relative package link</a>.
    8.15 +	</body>
    8.16 +</html>
    8.17 +

     9.1 --- a/test/com/sun/javadoc/testTaglets/TestTaglets.java	Tue Sep 08 11:12:13 2009 -0700
     9.2 +++ b/test/com/sun/javadoc/testTaglets/TestTaglets.java	Tue Sep 08 11:29:58 2009 -0700
     9.3 @@ -55,7 +55,7 @@
     9.4  
     9.5      //Input for string search tests.
     9.6      private static final String[][] TEST_4654308 = new String[][] {
     9.7 -        {"4654308" + FS + "C.html", "<B>Foo:</B><DD>my only method is " +
     9.8             "<A HREF=\"C.html#method()\"><CODE>here</CODE></A>"}
     9.9 +        {"4654308" + FS + "C.html", "<B>Foo:</B><DD>my only method is " +            "<A HREF=\"C.html#method()\"><CODE>here</CODE></A>"}
    9.10      };
    9.11      private static final String[][] NEGATED_TEST_4654308 = NO_TEST;
    9.12  

    10.1 --- a/test/com/sun/javadoc/testWarnings/pkg/package.html	Tue Sep 08 11:12:13 2009 -0700
    10.2 +++ b/test/com/sun/javadoc/testWarnings/pkg/package.html	Tue Sep 08 11:29:58 2009 -0700
    10.3 @@ -1,3 +1,4 @@
    10.4 -<HTML>
    10.5 -   Testing.
    10.6 -<HTML>
    10.7 \ No newline at end of file
    10.8 +<HTML>
    10.9 +   Testing.
   10.10 +<HTML>
   10.11 +

    11.1 --- a/test/tools/javah/SubClassConsts.win	Tue Sep 08 11:12:13 2009 -0700
    11.2 +++ b/test/tools/javah/SubClassConsts.win	Tue Sep 08 11:29:58 2009 -0700
    11.3 @@ -1,31 +1,31 @@
    11.4 -/* DO NOT EDIT THIS FILE - it is machine generated */
    11.5 -#include <jni.h>
    11.6 -/* Header for class SubClassConsts */
    11.7 -
    11.8 -#ifndef _Included_SubClassConsts
    11.9 -#define _Included_SubClassConsts
   11.10 -#ifdef __cplusplus
   11.11 -extern "C" {
   11.12 -#endif
   11.13 -#undef SubClassConsts_serialVersionUID
   11.14 -#define SubClassConsts_serialVersionUID 6733861379283244755i64
   11.15 -#undef SubClassConsts_SUPER_INT_CONSTANT
   11.16 -#define SubClassConsts_SUPER_INT_CONSTANT 3L
   11.17 -#undef SubClassConsts_SUPER_FLOAT_CONSTANT
   11.18 -#define SubClassConsts_SUPER_FLOAT_CONSTANT 99.3f
   11.19 -#undef SubClassConsts_SUPER_DOUBLE_CONSTANT
   11.20 -#define SubClassConsts_SUPER_DOUBLE_CONSTANT 33.2
   11.21 -#undef SubClassConsts_SUPER_BOOLEAN_CONSTANT
   11.22 -#define SubClassConsts_SUPER_BOOLEAN_CONSTANT 0L
   11.23 -#undef SubClassConsts_SUB_INT_CONSTANT
   11.24 -#define SubClassConsts_SUB_INT_CONSTANT 2L
   11.25 -#undef SubClassConsts_SUB_DOUBLE_CONSTANT
   11.26 -#define SubClassConsts_SUB_DOUBLE_CONSTANT 2.25
   11.27 -#undef SubClassConsts_SUB_FLOAT_CONSTANT
   11.28 -#define SubClassConsts_SUB_FLOAT_CONSTANT 7.9f
   11.29 -#undef SubClassConsts_SUB_BOOLEAN_CONSTANT
   11.30 -#define SubClassConsts_SUB_BOOLEAN_CONSTANT 1L
   11.31 -#ifdef __cplusplus
   11.32 -}
   11.33 -#endif
   11.34 -#endif
   11.35 +/* DO NOT EDIT THIS FILE - it is machine generated */
   11.36 +#include <jni.h>
   11.37 +/* Header for class SubClassConsts */
   11.38 +
   11.39 +#ifndef _Included_SubClassConsts
   11.40 +#define _Included_SubClassConsts
   11.41 +#ifdef __cplusplus
   11.42 +extern "C" {
   11.43 +#endif
   11.44 +#undef SubClassConsts_serialVersionUID
   11.45 +#define SubClassConsts_serialVersionUID 6733861379283244755i64
   11.46 +#undef SubClassConsts_SUPER_INT_CONSTANT
   11.47 +#define SubClassConsts_SUPER_INT_CONSTANT 3L
   11.48 +#undef SubClassConsts_SUPER_FLOAT_CONSTANT
   11.49 +#define SubClassConsts_SUPER_FLOAT_CONSTANT 99.3f
   11.50 +#undef SubClassConsts_SUPER_DOUBLE_CONSTANT
   11.51 +#define SubClassConsts_SUPER_DOUBLE_CONSTANT 33.2
   11.52 +#undef SubClassConsts_SUPER_BOOLEAN_CONSTANT
   11.53 +#define SubClassConsts_SUPER_BOOLEAN_CONSTANT 0L
   11.54 +#undef SubClassConsts_SUB_INT_CONSTANT
   11.55 +#define SubClassConsts_SUB_INT_CONSTANT 2L
   11.56 +#undef SubClassConsts_SUB_DOUBLE_CONSTANT
   11.57 +#define SubClassConsts_SUB_DOUBLE_CONSTANT 2.25
   11.58 +#undef SubClassConsts_SUB_FLOAT_CONSTANT
   11.59 +#define SubClassConsts_SUB_FLOAT_CONSTANT 7.9f
   11.60 +#undef SubClassConsts_SUB_BOOLEAN_CONSTANT
   11.61 +#define SubClassConsts_SUB_BOOLEAN_CONSTANT 1L
   11.62 +#ifdef __cplusplus
   11.63 +}
   11.64 +#endif
   11.65 +#endif