Ticket #17192: 17192-v3.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;
 import java.awt.FlowLayout;
+import java.awt.Font;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -12 +15 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -37 +43 @@
 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 +119 @@
         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>";
+
+        JPanel inst = new JPanel(new GridBagLayout());
+        addInstLine(inst, envJavaHomeAlt, envJavaHome);
+        addInstLine(inst, propJavaHomeAlt, propJavaHome);
+        addInstLine(inst, prefDirAlt, prefDir);
+        addInstLine(inst, userDataDirAlt, userDataDir);
+        addInstLine(inst, userCacheDirAlt, userCacheDir);
+
         about.addTab(tr("Info"), info);
         about.addTab(tr("Readme"), createScrollPane(readme));
         about.addTab(tr("Revision"), createScrollPane(revision));
@@ -118 +143 @@
         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");
@@ -133 +159 @@
         panel.add(about, GBC.std().fill());
 
         GuiHelper.prepareResizeableOptionPane(panel, panel.getPreferredSize());
-        int ret = new ExtendedDialog(MainApplication.getMainFrame(), tr("About JOSM..."), tr("OK"), tr("Report bug"))
-            .setButtonIcons("ok", "bug")
-            .setContent(panel, false)
-            .showDialog().getValue();
+        ExtendedDialog dlg = new ExtendedDialog(MainApplication.getMainFrame(), tr("About JOSM..."), tr("OK"), tr("Report bug"));
+        int ret = dlg.setButtonIcons("ok", "bug")
+                .setContent(panel, false)
+                .showDialog().getValue();
         if (2 == ret) {
             MainApplication.getMenu().reportbug.actionPerformed(null);
         }
+        GuiHelper.destroyComponents(panel, false);
+        dlg.dispose();
     }
 
+    private static class OpenDirAction extends AbstractAction {
+        final String dir;
+
+        OpenDirAction(String dir) {
+            super();
+            this.dir = dir;
+            setEnabled(dir != null && new File(dir).isDirectory());
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            OpenBrowser.displayUrl(new File(dir).toURI());
+        }
+    }
+
+    private void addInstLine(JPanel inst, String symbol, String dir) {
+        inst.add(new JLabel(symbol), GBC.std());
+        inst.add(GBC.glue(5, 0), GBC.std());
+        JLabel dirLabel;
+        if (dir != null && !dir.isEmpty()) {
+            dirLabel = new JLabel(dir);
+        } else {
+            dirLabel = new JLabel("(unset)");
+            dirLabel.setFont(dirLabel.getFont().deriveFont(Font.ITALIC));
+        }
+        inst.add(dirLabel, GBC.std().fill(GBC.HORIZONTAL));
+        JButton btn = new JButton(tr("open"));
+        btn.setAction(new OpenDirAction(dir));
+        btn.setToolTipText(tr("Open directory"));
+        btn.setIcon(ImageProvider.get("open", ImageProvider.ImageSizes.SMALLICON));
+        inst.add(btn, GBC.eol());
+    }
+
     private static JLabel createImageLink(String tooltip, String icon, final String link) {
         JLabel label = new JLabel(ImageProvider.get("dialogs/about", icon, ImageSizes.LARGEICON));
         label.setToolTipText(tooltip);

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

@@ -241 +241 @@
 
         String val = param;
         val = paramReplace(val, envJavaHome, envJavaHomeAlt);
-        val = paramReplace(val, envJavaHome, envJavaHomeAlt);
         val = paramReplace(val, propJavaHome, propJavaHomeAlt);
         val = paramReplace(val, prefDir, prefDirAlt);
         val = paramReplace(val, userDataDir, userDataDirAlt);