src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java
author herrick
Wed, 16 Oct 2019 09:57:23 -0400
branchJDK-8200758-branch
changeset 58647 2c43b89b1679
parent 58455 0d95b41d0895
child 58648 3bf53ffa9ae7
permissions -rw-r--r--
8231862: Decouple DesktopIntegration and LinuxPackageBundler classes Submitted-by: asemenyuk Reviewed-by: aherrick, almatvee
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
     1
/*
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
     2
 * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
     4
 *
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    10
 *
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    15
 * accompanied this code).
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    16
 *
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    20
 *
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    23
 * questions.
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    24
 */
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    25
package jdk.jpackage.internal;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    26
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    27
import java.nio.file.Path;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    28
import java.util.Map;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    29
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    30
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    31
/**
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    32
 * Application directory layout.
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    33
 */
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
    34
public final class ApplicationLayout implements PathGroup.Facade<ApplicationLayout> {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    35
    enum PathRole {
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    36
        RUNTIME, APP, LAUNCHERS, DESKTOP, APP_MODS, DLLS
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    37
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    38
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    39
    ApplicationLayout(Map<Object, Path> paths) {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    40
        data = new PathGroup(paths);
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    41
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    42
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    43
    private ApplicationLayout(PathGroup data) {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    44
        this.data = data;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    45
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    46
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    47
    @Override
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    48
    public PathGroup pathGroup() {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    49
        return data;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    50
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    51
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    52
    @Override
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    53
    public ApplicationLayout resolveAt(Path root) {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    54
        return new ApplicationLayout(pathGroup().resolveAt(root));
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    55
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    56
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    57
    /**
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    58
     * Path to launchers directory.
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    59
     */
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
    60
    public Path launchersDirectory() {
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    61
        return pathGroup().getPath(PathRole.LAUNCHERS);
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    62
    }
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    63
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    64
    /**
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    65
     * Path to directory with dynamic libraries.
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    66
     */
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
    67
    public Path dllDirectory() {
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    68
        return pathGroup().getPath(PathRole.DLLS);
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    69
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    70
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    71
    /**
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    72
     * Path to application data directory.
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    73
     */
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
    74
    public Path appDirectory() {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    75
        return pathGroup().getPath(PathRole.APP);
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    76
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    77
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    78
    /**
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    79
     * Path to Java runtime directory.
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    80
     */
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
    81
    public Path runtimeDirectory() {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    82
        return pathGroup().getPath(PathRole.RUNTIME);
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    83
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    84
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    85
    /**
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    86
     * Path to application mods directory.
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    87
     */
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
    88
    public Path appModsDirectory() {
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    89
        return pathGroup().getPath(PathRole.APP_MODS);
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    90
    }
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    91
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
    92
    /**
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    93
     * Path to directory with application's desktop integration files.
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    94
     */
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
    95
    public Path destktopIntegrationDirectory() {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    96
        return pathGroup().getPath(PathRole.DESKTOP);
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    97
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
    98
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
    99
    static ApplicationLayout linuxAppImage() {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   100
        return new ApplicationLayout(Map.of(
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
   101
                PathRole.LAUNCHERS, Path.of("bin"),
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
   102
                PathRole.APP, Path.of("lib/app"),
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
   103
                PathRole.RUNTIME, Path.of("lib/runtime"),
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
   104
                PathRole.DESKTOP, Path.of("lib"),
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
   105
                PathRole.DLLS, Path.of("lib"),
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
   106
                PathRole.APP_MODS, Path.of("lib/app/mods")
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   107
        ));
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   108
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   109
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   110
    static ApplicationLayout windowsAppImage() {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   111
        return new ApplicationLayout(Map.of(
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 58301
diff changeset
   112
                PathRole.LAUNCHERS, Path.of(""),
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   113
                PathRole.APP, Path.of("app"),
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   114
                PathRole.RUNTIME, Path.of("runtime"),
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   115
                PathRole.DESKTOP, Path.of(""),
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   116
                PathRole.DLLS, Path.of(""),
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   117
                PathRole.APP_MODS, Path.of("app/mods")
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   118
        ));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   119
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   120
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   121
    static ApplicationLayout macAppImage() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   122
        return new ApplicationLayout(Map.of(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   123
                PathRole.LAUNCHERS, Path.of("Contents/MacOS"),
58455
0d95b41d0895 8231706: change "Java" dir to "app" dir in jpackage app image
herrick
parents: 58416
diff changeset
   124
                PathRole.APP, Path.of("Contents/app"),
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   125
                PathRole.RUNTIME, Path.of("Contents/runtime"),
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   126
                PathRole.DESKTOP, Path.of("Contents/Resources"),
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   127
                PathRole.DLLS, Path.of("Contents/MacOS"),
58455
0d95b41d0895 8231706: change "Java" dir to "app" dir in jpackage app image
herrick
parents: 58416
diff changeset
   128
                PathRole.APP_MODS, Path.of("Contents/app/mods")
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   129
        ));
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   130
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   131
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   132
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   133
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   134
    public static ApplicationLayout platformAppImage() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   135
        if (Platform.isWindows()) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   136
            return windowsAppImage();
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   137
        }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   138
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   139
        if (Platform.isLinux()) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   140
            return linuxAppImage();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   141
        }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   142
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   143
        if (Platform.isMac()) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   144
            return macAppImage();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   145
        }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58302
diff changeset
   146
58647
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58455
diff changeset
   147
        throw Platform.throwUnknownPlatformError();
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   148
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   149
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   150
    static ApplicationLayout javaRuntime() {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   151
        return new ApplicationLayout(Map.of(PathRole.RUNTIME, Path.of("")));
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   152
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   153
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   154
    private final PathGroup data;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
diff changeset
   155
}