From 88707b5786c6fdc02f66666c19ce85bc974986c2 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 28 Dec 2016 21:43:36 +0100 Subject: [PATCH] Renamed OsUtil -> OSUtil --- src/dorkbox/systemTray/SystemTray.java | 14 +++++++------- src/dorkbox/systemTray/gnomeShell/Extension.java | 8 ++++---- src/dorkbox/systemTray/util/ImageUtils.java | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/dorkbox/systemTray/SystemTray.java b/src/dorkbox/systemTray/SystemTray.java index e38fc26..8a5decd 100644 --- a/src/dorkbox/systemTray/SystemTray.java +++ b/src/dorkbox/systemTray/SystemTray.java @@ -57,7 +57,7 @@ import dorkbox.systemTray.util.SystemTrayFixes; import dorkbox.util.CacheUtil; import dorkbox.util.IO; import dorkbox.util.OS; -import dorkbox.util.OsUtil; +import dorkbox.util.OSUtil; import dorkbox.util.Property; import dorkbox.util.SwingUtil; import dorkbox.util.process.ShellProcessBuilder; @@ -446,7 +446,7 @@ class SystemTray { // BLEH. if gnome-shell is running, IT'S REALLY GNOME! // we must ALWAYS do this check!! - boolean isReallyGnome = OsUtil.Linux.DesktopEnv.isGnome(); + boolean isReallyGnome = OSUtil.Linux.DesktopEnv.isGnome(); if (isReallyGnome) { if (DEBUG) { @@ -476,7 +476,7 @@ class SystemTray { trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon); } else if ("kde".equalsIgnoreCase(XDG)) { - if (OsUtil.Linux.isFedora()) { + if (OSUtil.Linux.isFedora()) { // Fedora KDE requires GtkStatusIcon trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon); } else { @@ -508,7 +508,7 @@ class SystemTray { } if ("gnome".equalsIgnoreCase(GDM)) { - if (OsUtil.Linux.isArch()) { + if (OSUtil.Linux.isArch()) { if (DEBUG) { logger.debug("Running Arch Linux."); } @@ -525,7 +525,7 @@ class SystemTray { // are we fedora? If so, what version? // now, what VERSION of fedora? 23/24/25/? don't have AppIndicator installed, so we have to use GtkStatusIcon - if (OsUtil.Linux.isFedora()) { + if (OSUtil.Linux.isFedora()) { if (DEBUG) { logger.debug("Running Fedora"); } @@ -533,7 +533,7 @@ class SystemTray { // 23 is gtk, 24/25 is gtk (but also wrong size unless we adjust it. ImageUtil automatically does this) trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon); } - else if (OsUtil.Linux.isUbuntu()) { + else if (OSUtil.Linux.isUbuntu()) { // so far, because of the interaction between gnome3 + ubuntu, the GtkStatusIcon miraculously works. trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon); } else { @@ -701,7 +701,7 @@ class SystemTray { } - if (OsUtil.Linux.isArch()) { + if (OSUtil.Linux.isArch()) { // arch linux is fun! if (isTrayType(trayType, TrayType.AppIndicator)) { diff --git a/src/dorkbox/systemTray/gnomeShell/Extension.java b/src/dorkbox/systemTray/gnomeShell/Extension.java index 365680c..96ac436 100644 --- a/src/dorkbox/systemTray/gnomeShell/Extension.java +++ b/src/dorkbox/systemTray/gnomeShell/Extension.java @@ -35,7 +35,7 @@ import java.util.List; import dorkbox.systemTray.SystemTray; import dorkbox.util.IO; -import dorkbox.util.OsUtil; +import dorkbox.util.OSUtil; import dorkbox.util.Property; import dorkbox.util.process.ShellProcessBuilder; @@ -214,7 +214,7 @@ class Extension { */ public static void install() { - if (!ENABLE_EXTENSION_INSTALL || !OsUtil.Linux.DesktopEnv.isGnome()) { + if (!ENABLE_EXTENSION_INSTALL || !OSUtil.Linux.DesktopEnv.isGnome()) { return; } @@ -222,7 +222,7 @@ class Extension { boolean hasSystemTray; // should just be 3.14.1 or 3.20 or similar - String gnomeVersion = OsUtil.Linux.DesktopEnv.getGnomeVersion(); + String gnomeVersion = OSUtil.Linux.DesktopEnv.getGnomeVersion(); if (gnomeVersion == null) { return; } @@ -382,7 +382,7 @@ class Extension { public static void unInstall() { - if (!ENABLE_EXTENSION_INSTALL || !OsUtil.Linux.DesktopEnv.isGnome()) { + if (!ENABLE_EXTENSION_INSTALL || !OSUtil.Linux.DesktopEnv.isGnome()) { return; } diff --git a/src/dorkbox/systemTray/util/ImageUtils.java b/src/dorkbox/systemTray/util/ImageUtils.java index ea8ad48..c4fe86b 100644 --- a/src/dorkbox/systemTray/util/ImageUtils.java +++ b/src/dorkbox/systemTray/util/ImageUtils.java @@ -51,7 +51,7 @@ import dorkbox.util.FileUtil; import dorkbox.util.IO; import dorkbox.util.LocationResolver; import dorkbox.util.OS; -import dorkbox.util.OsUtil; +import dorkbox.util.OSUtil; import dorkbox.util.SwingUtil; import dorkbox.util.process.ShellProcessBuilder; @@ -73,7 +73,7 @@ class ImageUtils { if (SystemTray.AUTO_TRAY_SIZE) { if (OS.isWindows()) { - int[] version = OsUtil.Windows.getVersion(); + int[] version = OSUtil.Windows.getVersion(); // if windows 8.1/10 - default size is x2 @@ -155,14 +155,14 @@ class ImageUtils { String XDG = System.getenv("XDG_CURRENT_DESKTOP"); if (XDG == null) { // Check if plasmashell is running, if it is -- then we are most likely KDE - double plasmaVersion = OsUtil.Linux.DesktopEnv.getPlasmaVersion(); + double plasmaVersion = OSUtil.Linux.DesktopEnv.getPlasmaVersion(); if (plasmaVersion > 0) { XDG = "kde"; } } if ("kde".equalsIgnoreCase(XDG)) { - double plasmaVersion = OsUtil.Linux.DesktopEnv.getPlasmaVersion(); + double plasmaVersion = OSUtil.Linux.DesktopEnv.getPlasmaVersion(); // 1 = 16 // 2 = 32 @@ -222,7 +222,7 @@ class ImageUtils { } // fedora 23+ has a different size for the indicator (NOT default 16px) - int fedoraVersion = OsUtil.Linux.getFedoraVersion(); + int fedoraVersion = OSUtil.Linux.getFedoraVersion(); if (trayScalingFactor == 0 && fedoraVersion >= 23) { if (SystemTray.DEBUG) { SystemTray.logger.debug("Adjusting tray/menu scaling for FEDORA " + fedoraVersion);