Changeset 16911 in josm

Timestamp:

2020-08-23T13:05:53+02:00 (4 years ago)

Author:

simon04

Message:

see #18376 - Status report: add Linux desktop environment

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ShowStatusReportAction.java (modified) (1 diff)
• tools/PlatformHookUnixoid.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -129 +129 @@
         if (PlatformManager.isPlatformUnixoid()) {
             PlatformHookUnixoid platform = (PlatformHookUnixoid) PlatformManager.getPlatform();
+            // Add desktop environment
+            platform.getDesktopEnvironment().ifPresent(desktop -> text
+                    .append("Desktop environment: ")
+                    .append(desktop)
+                    .append('\n'));
             // Add Java package details
             String packageDetails = platform.getJavaPackageDetails();

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -26 +26 @@
 import java.util.HashSet;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
@@ -100 +101 @@
     public String getDefaultStyle() {
         return "javax.swing.plaf.metal.MetalLookAndFeel";
+    }
+
+    /**
+     * Returns desktop environment based on the environment variable {@code XDG_CURRENT_DESKTOP}.
+     * @return desktop environment.
+     */
+    public Optional<String> getDesktopEnvironment() {
+        return Optional.ofNullable(Utils.getSystemEnv("XDG_CURRENT_DESKTOP")).filter(s -> !s.isEmpty());
     }