src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java
author herrick
Thu, 28 Mar 2019 13:47:40 -0400
branchJDK-8200758-branch
changeset 57291 f2d429260ad4
parent 57286 2ee6dedec44f
child 57307 4948a1944cf9
permissions -rw-r--r--
8221582: Rename jvm-args option to java-options Reviewed-by: kbr, ssadetski
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     1
/*
57106
ea870b9ce89a 8216492: Update copyright of all new jpackage fils to 2019
kcr
parents: 57099
diff changeset
     2
 * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     4
 *
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    10
 *
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    15
 * accompanied this code).
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    16
 *
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    20
 *
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    23
 * questions.
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    24
 */
56982
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56957
diff changeset
    25
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57021
diff changeset
    26
package jdk.jpackage.internal;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    27
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    28
import java.util.HashMap;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    29
import java.util.HashSet;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    30
import java.util.Map;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    31
import java.util.Set;
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57021
diff changeset
    32
import jdk.jpackage.internal.Arguments.CLIOptions;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    33
56994
b4aca2dbe2b5 8212537: Create method and class description comments for main functionality
herrick
parents: 56989
diff changeset
    34
/**
b4aca2dbe2b5 8212537: Create method and class description comments for main functionality
herrick
parents: 56989
diff changeset
    35
 * ValidOptions
b4aca2dbe2b5 8212537: Create method and class description comments for main functionality
herrick
parents: 56989
diff changeset
    36
 *
b4aca2dbe2b5 8212537: Create method and class description comments for main functionality
herrick
parents: 56989
diff changeset
    37
 * Two basic methods for validating command line options.
b4aca2dbe2b5 8212537: Create method and class description comments for main functionality
herrick
parents: 56989
diff changeset
    38
 *
b4aca2dbe2b5 8212537: Create method and class description comments for main functionality
herrick
parents: 56989
diff changeset
    39
 * initArgs()
b4aca2dbe2b5 8212537: Create method and class description comments for main functionality
herrick
parents: 56989
diff changeset
    40
 *      Computes the Map of valid options for each mode on this Platform.
b4aca2dbe2b5 8212537: Create method and class description comments for main functionality
herrick
parents: 56989
diff changeset
    41
 *
b4aca2dbe2b5 8212537: Create method and class description comments for main functionality
herrick
parents: 56989
diff changeset
    42
 * checkIfSupported(CLIOptions mode, CLIOptions arg)
b4aca2dbe2b5 8212537: Create method and class description comments for main functionality
herrick
parents: 56989
diff changeset
    43
 *      Determine if the given arg is valid in the given mode.
57192
3d6a21f41c10 8217802: Invalid Option warning message.
herrick
parents: 57150
diff changeset
    44
 *
3d6a21f41c10 8217802: Invalid Option warning message.
herrick
parents: 57150
diff changeset
    45
 * checkIfOtherSupported(CLIOptions mode, CLIOptions arg)
3d6a21f41c10 8217802: Invalid Option warning message.
herrick
parents: 57150
diff changeset
    46
 *      Determine if the given arg is valid in the a different mode.
56994
b4aca2dbe2b5 8212537: Create method and class description comments for main functionality
herrick
parents: 56989
diff changeset
    47
 */
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57062
diff changeset
    48
class ValidOptions {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    49
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    50
    enum USE {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    51
        ALL,        // valid in all cases
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    52
        LAUNCHER,   // valid when creating a launcher
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    53
        INSTALL     // valid when creating an installer
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    54
    }
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    55
        
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    56
    private static final HashMap<String, USE> options = new HashMap<>();
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    57
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    58
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    59
    // initializing list of mandatory arguments
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    60
    static {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    61
        options.put(CLIOptions.CREATE_IMAGE.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    62
        options.put(CLIOptions.CREATE_INSTALLER.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    63
        options.put(CLIOptions.NAME.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    64
        options.put(CLIOptions.VERSION.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    65
        options.put(CLIOptions.OUTPUT.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    66
        options.put(CLIOptions.TEMP_ROOT.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    67
        options.put(CLIOptions.VERBOSE.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    68
        options.put(CLIOptions.PREDEFINED_RUNTIME_IMAGE.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    69
        options.put(CLIOptions.RESOURCE_DIR.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    70
        options.put(CLIOptions.IDENTIFIER.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    71
        options.put(CLIOptions.DESCRIPTION.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    72
        options.put(CLIOptions.VENDOR.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    73
        options.put(CLIOptions.COPYRIGHT.getId(), USE.ALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    74
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    75
        options.put(CLIOptions.INPUT.getId(), USE.LAUNCHER);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    76
        options.put(CLIOptions.FILES.getId(), USE.LAUNCHER);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    77
        options.put(CLIOptions.MODULE.getId(), USE.LAUNCHER);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    78
        options.put(CLIOptions.MODULE_PATH.getId(), USE.LAUNCHER);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    79
        options.put(CLIOptions.ADD_MODULES.getId(), USE.LAUNCHER);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    80
        options.put(CLIOptions.MAIN_JAR.getId(), USE.LAUNCHER);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    81
        options.put(CLIOptions.APPCLASS.getId(), USE.LAUNCHER);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    82
        options.put(CLIOptions.ICON.getId(), USE.LAUNCHER);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    83
        options.put(CLIOptions.ARGUMENTS.getId(), USE.LAUNCHER);
57291
f2d429260ad4 8221582: Rename jvm-args option to java-options
herrick
parents: 57286
diff changeset
    84
        options.put(CLIOptions.JAVA_OPTIONS.getId(), USE.LAUNCHER);
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    85
        options.put(CLIOptions.ADD_LAUNCHER.getId(), USE.LAUNCHER);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    86
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    87
        options.put(CLIOptions.INSTALLER_TYPE.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    88
        options.put(CLIOptions.LICENSE_FILE.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    89
        options.put(CLIOptions.INSTALL_DIR.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    90
        options.put(CLIOptions.PREDEFINED_APP_IMAGE.getId(), USE.INSTALL);
57286
2ee6dedec44f 8221256: Fix create-installer specific options on MAC
herrick
parents: 57256
diff changeset
    91
2ee6dedec44f 8221256: Fix create-installer specific options on MAC
herrick
parents: 57256
diff changeset
    92
        options.put(CLIOptions.FILE_ASSOCIATIONS.getId(), 
2ee6dedec44f 8221256: Fix create-installer specific options on MAC
herrick
parents: 57256
diff changeset
    93
            (Platform.getPlatform() == Platform.MAC) ?  USE.ALL : USE.INSTALL);
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    94
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    95
        if (Platform.getPlatform() == Platform.WINDOWS) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    96
            options.put(CLIOptions.WIN_CONSOLE_HINT.getId(), USE.LAUNCHER);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    97
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    98
            options.put(CLIOptions.WIN_MENU_HINT.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
    99
            options.put(CLIOptions.WIN_MENU_GROUP.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   100
            options.put(CLIOptions.WIN_SHORTCUT_HINT.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   101
            options.put(CLIOptions.WIN_DIR_CHOOSER.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   102
            options.put(CLIOptions.WIN_REGISTRY_NAME.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   103
            options.put(CLIOptions.WIN_UPGRADE_UUID.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   104
            options.put(CLIOptions.WIN_PER_USER_INSTALLATION.getId(),
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   105
                        USE.INSTALL);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   106
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   107
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   108
        if (Platform.getPlatform() == Platform.MAC) {
57286
2ee6dedec44f 8221256: Fix create-installer specific options on MAC
herrick
parents: 57256
diff changeset
   109
            options.put(CLIOptions.MAC_SIGN.getId(), USE.ALL);
2ee6dedec44f 8221256: Fix create-installer specific options on MAC
herrick
parents: 57256
diff changeset
   110
            options.put(CLIOptions.MAC_BUNDLE_NAME.getId(), USE.ALL);
2ee6dedec44f 8221256: Fix create-installer specific options on MAC
herrick
parents: 57256
diff changeset
   111
            options.put(CLIOptions.MAC_BUNDLE_IDENTIFIER.getId(), USE.ALL);
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   112
            options.put(CLIOptions.MAC_BUNDLE_SIGNING_PREFIX.getId(),
57286
2ee6dedec44f 8221256: Fix create-installer specific options on MAC
herrick
parents: 57256
diff changeset
   113
                        USE.ALL);
2ee6dedec44f 8221256: Fix create-installer specific options on MAC
herrick
parents: 57256
diff changeset
   114
            options.put(CLIOptions.MAC_SIGNING_KEY_NAME.getId(), USE.ALL);
2ee6dedec44f 8221256: Fix create-installer specific options on MAC
herrick
parents: 57256
diff changeset
   115
            options.put(CLIOptions.MAC_SIGNING_KEYCHAIN.getId(), USE.ALL);
2ee6dedec44f 8221256: Fix create-installer specific options on MAC
herrick
parents: 57256
diff changeset
   116
            options.put(CLIOptions.MAC_APP_STORE_CATEGORY.getId(), USE.ALL);
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   117
            options.put(CLIOptions.MAC_APP_STORE_ENTITLEMENTS.getId(),
57286
2ee6dedec44f 8221256: Fix create-installer specific options on MAC
herrick
parents: 57256
diff changeset
   118
                        USE.ALL);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   119
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   120
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   121
        if (Platform.getPlatform() == Platform.LINUX) {
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   122
            options.put(CLIOptions.LINUX_BUNDLE_NAME.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   123
            options.put(CLIOptions.LINUX_DEB_MAINTAINER.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   124
            options.put(CLIOptions.LINUX_RPM_LICENSE_TYPE.getId(), USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   125
            options.put(CLIOptions.LINUX_PACKAGE_DEPENDENCIES.getId(),
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   126
                        USE.INSTALL);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   127
            options.put(CLIOptions.LINUX_MENU_GROUP.getId(), USE.INSTALL);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   128
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   129
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   130
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   131
    static boolean checkIfSupported(CLIOptions arg) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   132
        return options.containsKey(arg.getId());
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   133
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   134
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   135
    static boolean checkIfImageSupported(CLIOptions arg) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   136
        USE use = options.get(arg.getId());
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   137
        return USE.ALL == use || USE.LAUNCHER == use;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   138
    }
57192
3d6a21f41c10 8217802: Invalid Option warning message.
herrick
parents: 57150
diff changeset
   139
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   140
    static boolean checkIfInstallerSupported(CLIOptions arg) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   141
        USE use = options.get(arg.getId());
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57192
diff changeset
   142
        return USE.ALL == use || USE.INSTALL == use;
57192
3d6a21f41c10 8217802: Invalid Option warning message.
herrick
parents: 57150
diff changeset
   143
    }
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   144
}