src/demo/share/jpackage/JNLPConverter/src/jnlp/converter/Platform.java

@@ -1,14 +1,12 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
+ * published by the Free Software Foundation.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * version 2 for more details (a copy is included in the LICENSE file that

@@ -21,85 +19,64 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-package jdk.jpackage.internal;
+package jnlp.converter;
 
 import java.util.regex.Pattern;
 
-/**
- * Platform
- *
- * Use <code>Platform</code> to detect the operating system
- * that is currently running.
- *
- * Example:
- *
- *  Platform platform = Platform.getPlatform();
- *
- *  switch(platform) {
- *    case Platform.MAC: {
- *      // Do something
- *      break;
- *    }
- *    case Platform.WINDOWS:
- *    case Platform.LINUX: {
- *      // Do something else
- *    }
- *  }
- *
- */
-enum Platform {UNKNOWN, WINDOWS, LINUX, MAC;
+public enum Platform {
+    UNKNOWN, WINDOWS, LINUX, MAC;
     private static final Platform platform;
     private static final int majorVersion;
     private static final int minorVersion;
 
     static {
         String os = System.getProperty("os.name").toLowerCase();
 
-        if (os.indexOf("win") >= 0) {
+        if (os.contains("win")) {
             platform = Platform.WINDOWS;
-        }
-        else if (os.indexOf("nix") >= 0 || os.indexOf("nux") >= 0) {
+        } else if (os.contains("nix") || os.contains("nux")) {
             platform = Platform.LINUX;
-        }
-        else if (os.indexOf("mac") >= 0) {
+        } else if (os.contains("mac")) {
             platform = Platform.MAC;
-        }
-        else {
+        } else {
             platform = Platform.UNKNOWN;
         }
 
-        String version = System.getProperty("os.version").toString();
+        String version = System.getProperty("os.version");
         String[] parts = version.split(Pattern.quote("."));
 
         if (parts.length > 0) {
             majorVersion = Integer.parseInt(parts[0]);
 
             if (parts.length > 1) {
-                minorVersion = Integer.parseInt(parts[1]);
-            }
-            else {
+                minorVersion = Integer.parseInt(parts[0]);
+            } else {
                 minorVersion = -1;
             }
-        }
-        else {
+        } else {
             majorVersion = -1;
             minorVersion = -1;
         }
     }
 
-    private Platform() {}
+    private Platform() {
+    }
 
-    static Platform getPlatform() {
+    public static Platform getPlatform() {
         return platform;
     }
 
-    static int getMajorVersion() {
+    public static boolean isWindows() {
+        return (platform == Platform.WINDOWS);
+    }
+
+    public static int getMajorVersion() {
         return majorVersion;
     }
 
-    static int getMinorVersion() {
+    public static int getMinorVersion() {
         return minorVersion;
     }
 }