langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java
author robm
Tue, 19 Nov 2013 15:36:59 +0000
changeset 21816 1fa16478977c
parent 7681 1f0819a3341f
child 23971 f5ff1f5a8dee
permissions -rw-r--r--
8022206: Intermittent test failures in java/lang/ProcessBuilder/Basic.java Reviewed-by: chegar, alanb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
7681
1f0819a3341f 6962318: Update copyright year
ohair
parents: 7614
diff changeset
     2
 * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
06bc494ca11e Initial load
duke
parents:
diff changeset
     4
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
06bc494ca11e Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
06bc494ca11e Initial load
duke
parents:
diff changeset
     7
 * published by the Free Software Foundation.
06bc494ca11e Initial load
duke
parents:
diff changeset
     8
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
06bc494ca11e Initial load
duke
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
06bc494ca11e Initial load
duke
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
06bc494ca11e Initial load
duke
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
06bc494ca11e Initial load
duke
parents:
diff changeset
    13
 * accompanied this code).
06bc494ca11e Initial load
duke
parents:
diff changeset
    14
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
06bc494ca11e Initial load
duke
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
06bc494ca11e Initial load
duke
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
06bc494ca11e Initial load
duke
parents:
diff changeset
    18
 *
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 10
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 10
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 10
diff changeset
    21
 * questions.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    22
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    23
06bc494ca11e Initial load
duke
parents:
diff changeset
    24
/*
06bc494ca11e Initial load
duke
parents:
diff changeset
    25
 * @test
06bc494ca11e Initial load
duke
parents:
diff changeset
    26
 * @bug 4530730
06bc494ca11e Initial load
duke
parents:
diff changeset
    27
 * @summary stddoclet: With frames off, window titles have "()" appended
06bc494ca11e Initial load
duke
parents:
diff changeset
    28
 * @author dkramer
06bc494ca11e Initial load
duke
parents:
diff changeset
    29
 * @run main WindowTitles
06bc494ca11e Initial load
duke
parents:
diff changeset
    30
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    31
06bc494ca11e Initial load
duke
parents:
diff changeset
    32
06bc494ca11e Initial load
duke
parents:
diff changeset
    33
import com.sun.javadoc.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    34
import java.util.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    35
import java.io.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    36
06bc494ca11e Initial load
duke
parents:
diff changeset
    37
// If needing regular expression pattern matching,
06bc494ca11e Initial load
duke
parents:
diff changeset
    38
// see /java/pubs/dev/linkfix/src/LinkFix.java
06bc494ca11e Initial load
duke
parents:
diff changeset
    39
06bc494ca11e Initial load
duke
parents:
diff changeset
    40
/**
06bc494ca11e Initial load
duke
parents:
diff changeset
    41
 * Runs javadoc and runs regression tests on the resulting HTML.
06bc494ca11e Initial load
duke
parents:
diff changeset
    42
 * It reads each file, complete with newlines, into a string to easily
06bc494ca11e Initial load
duke
parents:
diff changeset
    43
 * find strings that contain newlines.
06bc494ca11e Initial load
duke
parents:
diff changeset
    44
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    45
public class WindowTitles
06bc494ca11e Initial load
duke
parents:
diff changeset
    46
{
06bc494ca11e Initial load
duke
parents:
diff changeset
    47
    private static final String BUGID = "4530730";
06bc494ca11e Initial load
duke
parents:
diff changeset
    48
    private static final String BUGNAME = "WindowTitles";
06bc494ca11e Initial load
duke
parents:
diff changeset
    49
    private static final String FS = System.getProperty("file.separator");
06bc494ca11e Initial load
duke
parents:
diff changeset
    50
    private static final String PS = System.getProperty("path.separator");
06bc494ca11e Initial load
duke
parents:
diff changeset
    51
    private static final String LS = System.getProperty("line.separator");
06bc494ca11e Initial load
duke
parents:
diff changeset
    52
    private static final String TMPDIR_STRING1 = "." + FS + "docs1" + FS;
06bc494ca11e Initial load
duke
parents:
diff changeset
    53
    private static final String TMPDIR_STRING2 = "." + FS + "docs2" + FS;
06bc494ca11e Initial load
duke
parents:
diff changeset
    54
06bc494ca11e Initial load
duke
parents:
diff changeset
    55
    // Subtest number.  Needed because runResultsOnHTML is run twice, and subtestNum
06bc494ca11e Initial load
duke
parents:
diff changeset
    56
    // should increment across subtest runs.
06bc494ca11e Initial load
duke
parents:
diff changeset
    57
    public static int subtestNum = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
    58
    public static int numSubtestsPassed = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
    59
06bc494ca11e Initial load
duke
parents:
diff changeset
    60
    // Entry point
06bc494ca11e Initial load
duke
parents:
diff changeset
    61
    public static void main(String[] args) {
06bc494ca11e Initial load
duke
parents:
diff changeset
    62
06bc494ca11e Initial load
duke
parents:
diff changeset
    63
        // Directory that contains source files that javadoc runs on
06bc494ca11e Initial load
duke
parents:
diff changeset
    64
        String srcdir = System.getProperty("test.src", ".");
06bc494ca11e Initial load
duke
parents:
diff changeset
    65
06bc494ca11e Initial load
duke
parents:
diff changeset
    66
        // Test for all cases except the split index page
06bc494ca11e Initial load
duke
parents:
diff changeset
    67
        runJavadoc(new String[] {"-d", TMPDIR_STRING1,
06bc494ca11e Initial load
duke
parents:
diff changeset
    68
                                 "-use",
06bc494ca11e Initial load
duke
parents:
diff changeset
    69
                                 "-sourcepath", srcdir,
06bc494ca11e Initial load
duke
parents:
diff changeset
    70
                                 "p1", "p2"});
06bc494ca11e Initial load
duke
parents:
diff changeset
    71
        runTestsOnHTML(testArray);
06bc494ca11e Initial load
duke
parents:
diff changeset
    72
06bc494ca11e Initial load
duke
parents:
diff changeset
    73
        // Test only for the split-index case (and run on only one package)
06bc494ca11e Initial load
duke
parents:
diff changeset
    74
        System.out.println("");  // blank line
06bc494ca11e Initial load
duke
parents:
diff changeset
    75
        runJavadoc(new String[] {"-d", TMPDIR_STRING2,
06bc494ca11e Initial load
duke
parents:
diff changeset
    76
                                 "-splitindex",
06bc494ca11e Initial load
duke
parents:
diff changeset
    77
                                 "-sourcepath", System.getProperty("test.src", "."),
06bc494ca11e Initial load
duke
parents:
diff changeset
    78
                                 "p1"});
06bc494ca11e Initial load
duke
parents:
diff changeset
    79
        runTestsOnHTML(testSplitIndexArray);
06bc494ca11e Initial load
duke
parents:
diff changeset
    80
06bc494ca11e Initial load
duke
parents:
diff changeset
    81
        printSummary();
06bc494ca11e Initial load
duke
parents:
diff changeset
    82
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
    83
06bc494ca11e Initial load
duke
parents:
diff changeset
    84
    /** Run javadoc */
06bc494ca11e Initial load
duke
parents:
diff changeset
    85
    public static void runJavadoc(String[] javadocArgs) {
06bc494ca11e Initial load
duke
parents:
diff changeset
    86
        if (com.sun.tools.javadoc.Main.execute(javadocArgs) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
    87
            throw new Error("Javadoc failed to execute");
06bc494ca11e Initial load
duke
parents:
diff changeset
    88
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
    89
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
    90
06bc494ca11e Initial load
duke
parents:
diff changeset
    91
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
    92
     * Assign value for [ stringToFind, filename ]
06bc494ca11e Initial load
duke
parents:
diff changeset
    93
     * NOTE: The standard doclet uses platform-specific line separators (LS)
06bc494ca11e Initial load
duke
parents:
diff changeset
    94
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
    95
    private static final String[][] testArray = {
06bc494ca11e Initial load
duke
parents:
diff changeset
    96
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
    97
            { "<title>Overview</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    98
                    TMPDIR_STRING1 + "overview-summary.html"                  },
06bc494ca11e Initial load
duke
parents:
diff changeset
    99
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   100
            { "<title>Class Hierarchy</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   101
                    TMPDIR_STRING1 + "overview-tree.html"                     },
06bc494ca11e Initial load
duke
parents:
diff changeset
   102
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   103
            { "<title>Overview List</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   104
                    TMPDIR_STRING1 + "overview-frame.html"                    },
06bc494ca11e Initial load
duke
parents:
diff changeset
   105
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   106
            { "<title>p1</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   107
                    TMPDIR_STRING1 + "p1" + FS + "package-summary.html"       },
06bc494ca11e Initial load
duke
parents:
diff changeset
   108
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   109
            { "<title>p1</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   110
                    TMPDIR_STRING1 + "p1" + FS + "package-frame.html"         },
06bc494ca11e Initial load
duke
parents:
diff changeset
   111
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   112
            { "<title>p1 Class Hierarchy</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   113
                    TMPDIR_STRING1 + "p1" + FS + "package-tree.html"          },
06bc494ca11e Initial load
duke
parents:
diff changeset
   114
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   115
            { "<title>Uses of Package p1</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   116
                    TMPDIR_STRING1 + "p1" + FS + "package-use.html"           },
06bc494ca11e Initial load
duke
parents:
diff changeset
   117
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   118
            { "<title>C1</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   119
                    TMPDIR_STRING1 + "p1" + FS + "C1.html"                    },
06bc494ca11e Initial load
duke
parents:
diff changeset
   120
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   121
            { "<title>All Classes</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   122
                    TMPDIR_STRING1 + "allclasses-frame.html"                  },
06bc494ca11e Initial load
duke
parents:
diff changeset
   123
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   124
            { "<title>All Classes</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   125
                    TMPDIR_STRING1 + "allclasses-noframe.html"                },
06bc494ca11e Initial load
duke
parents:
diff changeset
   126
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   127
            { "<title>Constant Field Values</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   128
                    TMPDIR_STRING1 + "constant-values.html"                   },
06bc494ca11e Initial load
duke
parents:
diff changeset
   129
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   130
            { "<title>Deprecated List</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   131
                    TMPDIR_STRING1 + "deprecated-list.html"                   },
06bc494ca11e Initial load
duke
parents:
diff changeset
   132
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   133
            { "<title>Serialized Form</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   134
                    TMPDIR_STRING1 + "serialized-form.html"                   },
06bc494ca11e Initial load
duke
parents:
diff changeset
   135
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   136
            { "<title>API Help</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   137
                    TMPDIR_STRING1 + "help-doc.html"                          },
06bc494ca11e Initial load
duke
parents:
diff changeset
   138
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   139
            { "<title>Index</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   140
                    TMPDIR_STRING1 + "index-all.html"                         },
06bc494ca11e Initial load
duke
parents:
diff changeset
   141
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   142
            { "<title>Uses of Class p1.C1</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   143
                    TMPDIR_STRING1 + "p1" + FS + "class-use" + FS + "C1.html" },
06bc494ca11e Initial load
duke
parents:
diff changeset
   144
        };
06bc494ca11e Initial load
duke
parents:
diff changeset
   145
06bc494ca11e Initial load
duke
parents:
diff changeset
   146
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   147
     * Assign value for [ stringToFind, filename ] for split index page
06bc494ca11e Initial load
duke
parents:
diff changeset
   148
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   149
    private static final String[][] testSplitIndexArray = {
7614
cfadc977ca75 6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents: 5520
diff changeset
   150
            { "<title>C-Index</title>",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   151
                    TMPDIR_STRING2 + "index-files" + FS + "index-1.html"       },
06bc494ca11e Initial load
duke
parents:
diff changeset
   152
        };
06bc494ca11e Initial load
duke
parents:
diff changeset
   153
06bc494ca11e Initial load
duke
parents:
diff changeset
   154
    public static void runTestsOnHTML(String[][] testArray) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   155
06bc494ca11e Initial load
duke
parents:
diff changeset
   156
        for (int i = 0; i < testArray.length; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   157
06bc494ca11e Initial load
duke
parents:
diff changeset
   158
            subtestNum += 1;
06bc494ca11e Initial load
duke
parents:
diff changeset
   159
06bc494ca11e Initial load
duke
parents:
diff changeset
   160
            // Read contents of file into a string
06bc494ca11e Initial load
duke
parents:
diff changeset
   161
            String fileString = readFileToString(testArray[i][1]);
06bc494ca11e Initial load
duke
parents:
diff changeset
   162
06bc494ca11e Initial load
duke
parents:
diff changeset
   163
            // Get string to find
06bc494ca11e Initial load
duke
parents:
diff changeset
   164
            String stringToFind = testArray[i][0];
06bc494ca11e Initial load
duke
parents:
diff changeset
   165
06bc494ca11e Initial load
duke
parents:
diff changeset
   166
            // Find string in file's contents
06bc494ca11e Initial load
duke
parents:
diff changeset
   167
            if (findString(fileString, stringToFind) == -1) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   168
                System.out.println("\nSub-test " + (subtestNum)
06bc494ca11e Initial load
duke
parents:
diff changeset
   169
                    + " for bug " + BUGID + " (" + BUGNAME + ") FAILED\n"
06bc494ca11e Initial load
duke
parents:
diff changeset
   170
                    + "when searching for:\n"
06bc494ca11e Initial load
duke
parents:
diff changeset
   171
                    + stringToFind);
06bc494ca11e Initial load
duke
parents:
diff changeset
   172
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   173
                numSubtestsPassed += 1;
06bc494ca11e Initial load
duke
parents:
diff changeset
   174
                System.out.println("\nSub-test " + (subtestNum) + " passed:\n" + stringToFind);
06bc494ca11e Initial load
duke
parents:
diff changeset
   175
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   176
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   177
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   178
06bc494ca11e Initial load
duke
parents:
diff changeset
   179
    public static void printSummary() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   180
        if ( numSubtestsPassed == subtestNum ) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   181
            System.out.println("\nAll " + numSubtestsPassed + " subtests passed");
06bc494ca11e Initial load
duke
parents:
diff changeset
   182
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   183
            throw new Error("\n" + (subtestNum - numSubtestsPassed) + " of " + (subtestNum)
06bc494ca11e Initial load
duke
parents:
diff changeset
   184
                             + " subtests failed for bug " + BUGID + " (" + BUGNAME + ")\n");
06bc494ca11e Initial load
duke
parents:
diff changeset
   185
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   186
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   187
06bc494ca11e Initial load
duke
parents:
diff changeset
   188
    // Read the file into a String
06bc494ca11e Initial load
duke
parents:
diff changeset
   189
    public static String readFileToString(String filename) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   190
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   191
            File file = new File(filename);
06bc494ca11e Initial load
duke
parents:
diff changeset
   192
            if ( !file.exists() ) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   193
                System.out.println("\nFILE DOES NOT EXIST: " + filename);
06bc494ca11e Initial load
duke
parents:
diff changeset
   194
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   195
            BufferedReader in = new BufferedReader(new FileReader(file));
06bc494ca11e Initial load
duke
parents:
diff changeset
   196
06bc494ca11e Initial load
duke
parents:
diff changeset
   197
            // Create an array of characters the size of the file
06bc494ca11e Initial load
duke
parents:
diff changeset
   198
            char[] allChars = new char[(int)file.length()];
06bc494ca11e Initial load
duke
parents:
diff changeset
   199
06bc494ca11e Initial load
duke
parents:
diff changeset
   200
            // Read the characters into the allChars array
06bc494ca11e Initial load
duke
parents:
diff changeset
   201
            in.read(allChars, 0, (int)file.length());
06bc494ca11e Initial load
duke
parents:
diff changeset
   202
            in.close();
06bc494ca11e Initial load
duke
parents:
diff changeset
   203
06bc494ca11e Initial load
duke
parents:
diff changeset
   204
            // Convert to a string
06bc494ca11e Initial load
duke
parents:
diff changeset
   205
            String allCharsString = new String(allChars);
06bc494ca11e Initial load
duke
parents:
diff changeset
   206
06bc494ca11e Initial load
duke
parents:
diff changeset
   207
            return allCharsString;
06bc494ca11e Initial load
duke
parents:
diff changeset
   208
06bc494ca11e Initial load
duke
parents:
diff changeset
   209
        } catch (FileNotFoundException e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   210
            System.err.println(e);
06bc494ca11e Initial load
duke
parents:
diff changeset
   211
            return "";
06bc494ca11e Initial load
duke
parents:
diff changeset
   212
        } catch (IOException e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   213
            System.err.println(e);
06bc494ca11e Initial load
duke
parents:
diff changeset
   214
            return "";
06bc494ca11e Initial load
duke
parents:
diff changeset
   215
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   216
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   217
06bc494ca11e Initial load
duke
parents:
diff changeset
   218
    public static int findString(String fileString, String stringToFind) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   219
        return fileString.indexOf(stringToFind);
06bc494ca11e Initial load
duke
parents:
diff changeset
   220
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   221
}