stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8264334: Use the blessed modifier order in jdk.jpackage

Browse Source 
Reviewed-by: herrick, shade
This commit is contained in:
Alex Blewitt 2021-03-29 08:01:42 +00:00 committed by Aleksey Shipilev
parent 8ee9a05d37
commit 30b4b17ccb
19 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LibProvidersLookup.java
View File

@ -43,7 +43,7 @@ import java.util.stream.Stream;
/** /**
* Builds list of packages providing dynamic libraries for the given set of files. * Builds list of packages providing dynamic libraries for the given set of files.
*/ */
final public class LibProvidersLookup { public final class LibProvidersLookup {
static boolean supported() { static boolean supported() {
return (new ToolValidator(TOOL_LDD).validate() == null); return (new ToolValidator(TOOL_LDD).validate() == null);
} }

2
src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java
View File

@ -54,7 +54,7 @@ public class LinuxAppImageBuilder extends AbstractAppImageBuilder {
}, },
(s, p) -> Path.of(s)); (s, p) -> Path.of(s));
final static String DEFAULT_ICON = "JavaApp.png"; static final String DEFAULT_ICON = "JavaApp.png";
LinuxAppImageBuilder(Path imageOutDir) { LinuxAppImageBuilder(Path imageOutDir) {
super(imageOutDir); super(imageOutDir);

8
src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
View File

@ -91,11 +91,11 @@ public class LinuxDebBundler extends LinuxPackageBundler {
return s; return s;
}); });
private final static String TOOL_DPKG_DEB = "dpkg-deb"; private static final String TOOL_DPKG_DEB = "dpkg-deb";
private final static String TOOL_DPKG = "dpkg"; private static final String TOOL_DPKG = "dpkg";
private final static String TOOL_FAKEROOT = "fakeroot"; private static final String TOOL_FAKEROOT = "fakeroot";
private final static String DEB_ARCH; private static final String DEB_ARCH;
static { static {
String debArch; String debArch;
try { try {

20
src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java
View File

@ -56,7 +56,7 @@ abstract class LinuxPackageBundler extends AbstractBundler {
} }
@Override @Override
final public boolean validate(Map<String, ? super Object> params) public final boolean validate(Map<String, ? super Object> params)
throws ConfigException { throws ConfigException {
// run basic validation to ensure requirements are met // run basic validation to ensure requirements are met
@ -106,12 +106,12 @@ abstract class LinuxPackageBundler extends AbstractBundler {
} }
@Override @Override
final public String getBundleType() { public final String getBundleType() {
return "INSTALLER"; return "INSTALLER";
} }
@Override @Override
final public Path execute(Map<String, ? super Object> params, public final Path execute(Map<String, ? super Object> params,
Path outputParentDir) throws PackagerException { Path outputParentDir) throws PackagerException {
IOUtils.writableOutputDir(outputParentDir); IOUtils.writableOutputDir(outputParentDir);
@ -233,28 +233,28 @@ abstract class LinuxPackageBundler extends AbstractBundler {
return data; return data;
} }
abstract protected List<ConfigException> verifyOutputBundle( protected abstract List<ConfigException> verifyOutputBundle(
Map<String, ? super Object> params, Path packageBundle); Map<String, ? super Object> params, Path packageBundle);
abstract protected void initLibProvidersLookup( protected abstract void initLibProvidersLookup(
Map<String, ? super Object> params, Map<String, ? super Object> params,
LibProvidersLookup libProvidersLookup); LibProvidersLookup libProvidersLookup);
abstract protected List<ToolValidator> getToolValidators( protected abstract List<ToolValidator> getToolValidators(
Map<String, ? super Object> params); Map<String, ? super Object> params);
abstract protected void doValidate(Map<String, ? super Object> params) protected abstract void doValidate(Map<String, ? super Object> params)
throws ConfigException; throws ConfigException;
abstract protected Map<String, String> createReplacementData( protected abstract Map<String, String> createReplacementData(
Map<String, ? super Object> params) throws IOException; Map<String, ? super Object> params) throws IOException;
abstract protected Path buildPackageBundle( protected abstract Path buildPackageBundle(
Map<String, String> replacementData, Map<String, String> replacementData,
Map<String, ? super Object> params, Path outputParentDir) throws Map<String, ? super Object> params, Path outputParentDir) throws
PackagerException, IOException; PackagerException, IOException;
final protected PlatformPackage createMetaPackage( protected final PlatformPackage createMetaPackage(
Map<String, ? super Object> params) { Map<String, ? super Object> params) {
Supplier<ApplicationLayout> packageLayout = () -> { Supplier<ApplicationLayout> packageLayout = () -> {

8
src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
View File

@ -110,11 +110,11 @@ public class LinuxRpmBundler extends LinuxPackageBundler {
params -> null, params -> null,
(s, p) -> s); (s, p) -> s);
private final static String DEFAULT_SPEC_TEMPLATE = "template.spec"; private static final String DEFAULT_SPEC_TEMPLATE = "template.spec";
public final static String TOOL_RPM = "rpm"; public static final String TOOL_RPM = "rpm";
public final static String TOOL_RPMBUILD = "rpmbuild"; public static final String TOOL_RPMBUILD = "rpmbuild";
public final static DottedVersion TOOL_RPMBUILD_MIN_VERSION = DottedVersion.lazy( public static final DottedVersion TOOL_RPMBUILD_MIN_VERSION = DottedVersion.lazy(
"4.10"); "4.10");
public LinuxRpmBundler() { public LinuxRpmBundler() {

2
src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
View File

@ -572,7 +572,7 @@ public class MacDmgBundler extends MacBaseInstallerBundler {
return isSupported(); return isSupported();
} }
public final static String[] required = public static final String[] required =
{"/usr/bin/hdiutil", "/usr/bin/osascript"}; {"/usr/bin/hdiutil", "/usr/bin/osascript"};
public static boolean isSupported() { public static boolean isSupported() {
try { try {

14
src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java
View File

@ -41,22 +41,22 @@ import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
class AppImageBundler extends AbstractBundler { class AppImageBundler extends AbstractBundler {
@Override @Override
final public String getName() { public final String getName() {
return I18N.getString("app.bundler.name"); return I18N.getString("app.bundler.name");
} }
@Override @Override
final public String getID() { public final String getID() {
return "app"; return "app";
} }
@Override @Override
final public String getBundleType() { public final String getBundleType() {
return "IMAGE"; return "IMAGE";
} }
@Override @Override
final public boolean validate(Map<String, ? super Object> params) public final boolean validate(Map<String, ? super Object> params)
throws ConfigException { throws ConfigException {
try { try {
Objects.requireNonNull(params); Objects.requireNonNull(params);
@ -81,7 +81,7 @@ class AppImageBundler extends AbstractBundler {
} }
@Override @Override
final public Path execute(Map<String, ? super Object> params, public final Path execute(Map<String, ? super Object> params,
Path outputParentDir) throws PackagerException { Path outputParentDir) throws PackagerException {
if (StandardBundlerParam.isRuntimeInstaller(params)) { if (StandardBundlerParam.isRuntimeInstaller(params)) {
return PREDEFINED_RUNTIME_IMAGE.fetchFrom(params); return PREDEFINED_RUNTIME_IMAGE.fetchFrom(params);
@ -98,12 +98,12 @@ class AppImageBundler extends AbstractBundler {
} }
@Override @Override
final public boolean supported(boolean runtimeInstaller) { public final boolean supported(boolean runtimeInstaller) {
return true; return true;
} }
@Override @Override
final public boolean isDefault() { public final boolean isDefault() {
return false; return false;
} }

4
src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
View File

@ -55,9 +55,9 @@ public class AppImageFile {
private final String launcherName; private final String launcherName;
private final List<String> addLauncherNames; private final List<String> addLauncherNames;
private final static String FILENAME = ".jpackage.xml"; private static final String FILENAME = ".jpackage.xml";
private final static Map<Platform, String> PLATFORM_LABELS = Map.of( private static final Map<Platform, String> PLATFORM_LABELS = Map.of(
Platform.LINUX, "linux", Platform.WINDOWS, "windows", Platform.MAC, Platform.LINUX, "linux", Platform.WINDOWS, "windows", Platform.MAC,
"macOS"); "macOS");

2
src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java
View File

@ -31,7 +31,7 @@ import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
public class BundleParams { public class BundleParams {
final protected Map<String, ? super Object> params; protected final Map<String, ? super Object> params;
/** /**
* create a new bundle with all default values * create a new bundle with all default values

2
src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
View File

@ -144,5 +144,5 @@ final class CfgFile {
List<String> javaOptions; List<String> javaOptions;
private final ApplicationLayout appLayout; private final ApplicationLayout appLayout;
private final static Object SECTION_TAG = new Object(); private static final Object SECTION_TAG = new Object();
} }

6
src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java
View File

@ -160,9 +160,9 @@ final class DottedVersion implements Comparable<String> {
return components; return components;
} }
final private BigInteger[] components; private final BigInteger[] components;
final private String value; private final String value;
final private boolean greedy; private final boolean greedy;
private static final Pattern DIGITS = Pattern.compile("\\d+"); private static final Pattern DIGITS = Pattern.compile("\\d+");
} }

4
src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java
View File

@ -36,7 +36,7 @@ import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
final public class Executor { public final class Executor {
Executor() { Executor() {
} }
@ -223,7 +223,7 @@ final public class Executor {
return sb.toString(); return sb.toString();
} }
public final static int INFINITE_TIMEOUT = -1; public static final int INFINITE_TIMEOUT = -1;
private ProcessBuilder pb; private ProcessBuilder pb;
private boolean saveOutput; private boolean saveOutput;

4
src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java
View File

@ -213,10 +213,10 @@ final class JLinkBundlerHelper {
} }
// The token for "all modules on the module path". // The token for "all modules on the module path".
private final static String ALL_MODULE_PATH = "ALL-MODULE-PATH"; private static final String ALL_MODULE_PATH = "ALL-MODULE-PATH";
// The token for "all valid runtime modules". // The token for "all valid runtime modules".
private final static String ALL_DEFAULT = "ALL-DEFAULT"; private static final String ALL_DEFAULT = "ALL-DEFAULT";
private static class LazyLoad { private static class LazyLoad {
static final ToolProvider JLINK_TOOL = ToolProvider.findFirst( static final ToolProvider JLINK_TOOL = ToolProvider.findFirst(

6
src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
View File

@ -57,9 +57,9 @@ import java.util.stream.Stream;
class StandardBundlerParam<T> extends BundlerParamInfo<T> { class StandardBundlerParam<T> extends BundlerParamInfo<T> {
private static final String JAVABASEJMOD = "java.base.jmod"; private static final String JAVABASEJMOD = "java.base.jmod";
private final static String DEFAULT_VERSION = "1.0"; private static final String DEFAULT_VERSION = "1.0";
private final static String DEFAULT_RELEASE = "1"; private static final String DEFAULT_RELEASE = "1";
private final static String[] DEFAULT_JLINK_OPTIONS = { private static final String[] DEFAULT_JLINK_OPTIONS = {
"--strip-native-commands", "--strip-native-commands",
"--strip-debug", "--strip-debug",
"--no-man-pages", "--no-man-pages",

2
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
View File

@ -54,7 +54,7 @@ public class WinExeBundler extends AbstractBundler {
}, },
(s, p) -> null); (s, p) -> null);
private final static String EXE_WRAPPER_NAME = "msiwrapper.exe"; private static final String EXE_WRAPPER_NAME = "msiwrapper.exe";
@Override @Override
public String getName() { public String getName() {

20
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixAppImageFragmentBuilder.java
View File

@ -832,29 +832,29 @@ class WixAppImageFragmentBuilder extends WixFragmentBuilder {
private Map<Path, Integer> removeFolderItems; private Map<Path, Integer> removeFolderItems;
private Set<String> defaultedMimes; private Set<String> defaultedMimes;
private final static Path TARGETDIR = Path.of("TARGETDIR"); private static final Path TARGETDIR = Path.of("TARGETDIR");
private final static Path INSTALLDIR = Path.of("INSTALLDIR"); private static final Path INSTALLDIR = Path.of("INSTALLDIR");
private final static Set<Path> ROOT_DIRS = Set.of(INSTALLDIR, TARGETDIR); private static final Set<Path> ROOT_DIRS = Set.of(INSTALLDIR, TARGETDIR);
private final static Path PROGRAM_MENU_PATH = TARGETDIR.resolve("ProgramMenuFolder"); private static final Path PROGRAM_MENU_PATH = TARGETDIR.resolve("ProgramMenuFolder");
private final static Path DESKTOP_PATH = TARGETDIR.resolve("DesktopFolder"); private static final Path DESKTOP_PATH = TARGETDIR.resolve("DesktopFolder");
private final static Path PROGRAM_FILES = TARGETDIR.resolve( private static final Path PROGRAM_FILES = TARGETDIR.resolve(
is64Bit() ? "ProgramFiles64Folder" : "ProgramFilesFolder"); is64Bit() ? "ProgramFiles64Folder" : "ProgramFilesFolder");
private final static Path LOCAL_PROGRAM_FILES = TARGETDIR.resolve("LocalAppDataFolder"); private static final Path LOCAL_PROGRAM_FILES = TARGETDIR.resolve("LocalAppDataFolder");
private final static Set<Path> SYSTEM_DIRS = Set.of(TARGETDIR, private static final Set<Path> SYSTEM_DIRS = Set.of(TARGETDIR,
PROGRAM_MENU_PATH, DESKTOP_PATH, PROGRAM_FILES, LOCAL_PROGRAM_FILES); PROGRAM_MENU_PATH, DESKTOP_PATH, PROGRAM_FILES, LOCAL_PROGRAM_FILES);
private final static Set<Path> KNOWN_DIRS = Stream.of(Set.of(INSTALLDIR), private static final Set<Path> KNOWN_DIRS = Stream.of(Set.of(INSTALLDIR),
SYSTEM_DIRS).flatMap(Set::stream).collect( SYSTEM_DIRS).flatMap(Set::stream).collect(
Collectors.toUnmodifiableSet()); Collectors.toUnmodifiableSet());
private final static Set<Path> USER_PROFILE_DIRS = Set.of(LOCAL_PROGRAM_FILES, private static final Set<Path> USER_PROFILE_DIRS = Set.of(LOCAL_PROGRAM_FILES,
PROGRAM_MENU_PATH, DESKTOP_PATH); PROGRAM_MENU_PATH, DESKTOP_PATH);
private static final StandardBundlerParam<String> MENU_GROUP = private static final StandardBundlerParam<String> MENU_GROUP =

2
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixPipeline.java
View File

@ -135,7 +135,7 @@ public class WixPipeline {
workDir != null ? workDir.toFile() : null)).executeExpectSuccess(); workDir != null ? workDir.toFile() : null)).executeExpectSuccess();
} }
private final static class WixSource { private static final class WixSource {
Path source; Path source;
Map<String, String> variables; Map<String, String> variables;
} }

2
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java
View File

@ -123,7 +123,7 @@ public enum WixTool {
})::validate; })::validate;
} }
private final static DottedVersion MINIMAL_VERSION = DottedVersion.lazy("3.0"); private static final DottedVersion MINIMAL_VERSION = DottedVersion.lazy("3.0");
static Path getSystemDir(String envVar, String knownDir) { static Path getSystemDir(String envVar, String knownDir) {
return Optional return Optional

6
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixUiFragmentBuilder.java
View File

@ -327,7 +327,7 @@ final class WixUiFragmentBuilder extends WixFragmentBuilder {
private final String id; private final String id;
} }
private final static class DialogPair { private static final class DialogPair {
DialogPair(Dialog first, Dialog second) { DialogPair(Dialog first, Dialog second) {
this(first.id, second.id); this(first.id, second.id);
@ -375,7 +375,7 @@ final class WixUiFragmentBuilder extends WixFragmentBuilder {
private final String secondId; private final String secondId;
} }
private final static class Publish { private static final class Publish {
Publish(String control, String condition, int order) { Publish(String control, String condition, int order) {
this.control = control; this.control = control;
@ -388,7 +388,7 @@ final class WixUiFragmentBuilder extends WixFragmentBuilder {
private final int order; private final int order;
} }
private final static class PublishBuilder { private static final class PublishBuilder {
PublishBuilder() { PublishBuilder() {
order(0); order(0);