Ticket #17192: 17192.patch

src/org/openstreetmap/josm/actions/AboutAction.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.Utils.getSystemEnv;
+import static org.openstreetmap.josm.tools.Utils.getSystemProperty;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -37 +39 @@
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -112 +115 @@
         info.add(logos, GBC.eol().insets(0, 10, 0, 0));
         info.add(GBC.glue(0, 5), GBC.eol());
 
+        final String envJavaHome = getSystemEnv("JAVA_HOME");
+        final String envJavaHomeAlt = PlatformManager.isPlatformWindows() ? "%JAVA_HOME%" : "${JAVA_HOME}";
+        final String propJavaHome = getSystemProperty("java.home");
+        final String propJavaHomeAlt = "<java.home>";
+        final String prefDir = Config.getDirs().getPreferencesDirectory(false).toString();
+        final String prefDirAlt = "<josm.pref>";
+        final String userDataDir = Config.getDirs().getUserDataDirectory(false).toString();
+        final String userDataDirAlt = "<josm.userdata>";
+        final String userCacheDir = Config.getDirs().getCacheDirectory(false).toString();
+        final String userCacheDirAlt = "<josm.cache>";
+
+        JosmTextArea inst = new JosmTextArea();
+        inst.setEditable(false);
+        inst.append(envJavaHomeAlt + " = " + envJavaHome + '\n');
+        inst.append(propJavaHomeAlt + " = " + propJavaHome + '\n');
+        inst.append(prefDirAlt + " = " + prefDir + '\n');
+        inst.append(userDataDirAlt + " = " + userDataDir + '\n');
+        inst.append(userCacheDirAlt + " = " + userCacheDir + '\n');
+        inst.setCaretPosition(0);
+
         about.addTab(tr("Info"), info);
         about.addTab(tr("Readme"), createScrollPane(readme));
         about.addTab(tr("Revision"), createScrollPane(revision));
@@ -118 +141 @@
         about.addTab(tr("Contribution"), createScrollPane(contribution));
         about.addTab(tr("License"), createScrollPane(license));
         about.addTab(tr("Plugins"), new JScrollPane(PluginHandler.getInfoPanel()));
+        about.addTab(tr("Installation Details"), inst);
 
         // Get the list of Launchpad contributors using customary msgid “translator-credits”
         String translators = tr("translator-credits");