Index: /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 11155) +++ /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 11156) @@ -110,5 +110,5 @@ .append((int) maxScreenSize.getHeight()).append('\n'); - if (Main.platform.getClass() == PlatformHookUnixoid.class) { + if (Main.platform instanceof PlatformHookUnixoid) { // Add Java package details String packageDetails = ((PlatformHookUnixoid) Main.platform).getJavaPackageDetails(); Index: /trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 11155) +++ /trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 11156) @@ -48,5 +48,5 @@ // Desktop API works fine under Windows, so we don't try any fallback in case of I/O exceptions because it's not API's fault Desktop.getDesktop().browse(uri); - } else if (Main.platform instanceof PlatformHookUnixoid) { + } else if (Main.platform instanceof PlatformHookUnixoid || Main.platform instanceof PlatformHookOsx) { // see #5629 #5108 #9568 Main.platform.openUrl(uri.toString()); Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 11155) +++ /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 11156) @@ -2,4 +2,5 @@ package org.openstreetmap.josm.tools; +import java.awt.GraphicsEnvironment; import java.io.File; import java.io.IOException; @@ -23,5 +24,7 @@ * that we want to be integrated with the OS before we setup our GUI. */ - void preStartupHook(); + default void preStartupHook() { + // Do nothing + } /** @@ -31,5 +34,7 @@ * It is guaranteed to be called before the GUI setup has started. */ - void afterPrefStartupHook(); + default void afterPrefStartupHook() { + // Do nothing + } /** @@ -40,5 +45,7 @@ * OS, so we'll receive events from the system menu. */ - void startupHook(); + default void startupHook() { + // Do nothing + } /** @@ -79,6 +86,5 @@ * JVM is too dumb to provide correct names for all the keys. * - * Another reason not to use the implementation in the *nix - * hook are LAFs that don't understand HTML, such as the OSX LAFs. + * Some LAFs don't understand HTML, such as the OSX LAFs. * * @param name Tooltip text to display @@ -86,5 +92,14 @@ * @return Full tooltip text (name + accelerator) */ - String makeTooltip(String name, Shortcut sc); + default String makeTooltip(String name, Shortcut sc) { + StringBuilder result = new StringBuilder(); + result.append("").append(name); + if (sc != null && !sc.getKeyText().isEmpty()) { + result.append(" (") + .append(sc.getKeyText()) + .append(")"); + } + return result.append(" ").toString(); + } /** @@ -98,5 +113,8 @@ * @return {@code true} if full screen is allowed, {@code false} otherwise */ - boolean canFullscreen(); + default boolean canFullscreen() { + return !GraphicsEnvironment.isHeadless() && + GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().isFullScreenSupported(); + } /** @@ -106,5 +124,7 @@ * @return {@code true} if the file has been renamed, {@code false} otherwise */ - boolean rename(File from, File to); + default boolean rename(File from, File to) { + return from.renameTo(to); + } /** @@ -126,6 +146,9 @@ * @since 7343 */ - boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert) - throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException; + default boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert) + throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException { + // TODO setup HTTPS certificate on Unix and OS X systems + return false; + } /** Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 11155) +++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 11156) @@ -28,7 +28,7 @@ * @since 1023 */ -public class PlatformHookOsx extends PlatformHookUnixoid implements InvocationHandler { - - private static PlatformHookOsx ivhandler = new PlatformHookOsx(); +public class PlatformHookOsx implements PlatformHook, InvocationHandler { + + private static final PlatformHookOsx ivhandler = new PlatformHookOsx(); @Override Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 11155) +++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 11156) @@ -6,38 +6,20 @@ import java.awt.Desktop; import java.awt.Dimension; -import java.awt.GraphicsEnvironment; import java.awt.event.KeyEvent; import java.io.BufferedReader; -import java.io.BufferedWriter; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; -import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Locale; -import java.util.Properties; import javax.swing.JOptionPane; import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.Preferences.pref; -import org.openstreetmap.josm.data.Preferences.writeExplicitly; import org.openstreetmap.josm.gui.ExtendedDialog; import org.openstreetmap.josm.gui.util.GuiHelper; @@ -51,49 +33,4 @@ public class PlatformHookUnixoid implements PlatformHook { - /** - * Simple data class to hold information about a font. - * - * Used for fontconfig.properties files. - */ - public static class FontEntry { - /** - * The character subset. Basically a free identifier, but should be unique. - */ - @pref - public String charset; - - /** - * Platform font name. - */ - @pref - @writeExplicitly - public String name = ""; - - /** - * File name. - */ - @pref - @writeExplicitly - public String file = ""; - - /** - * Constructs a new {@code FontEntry}. - */ - public FontEntry() { - } - - /** - * Constructs a new {@code FontEntry}. - * @param charset The character subset. Basically a free identifier, but should be unique - * @param name Platform font name - * @param file File name - */ - public FontEntry(String charset, String name, String file) { - this.charset = charset; - this.name = name; - this.file = file; - } - } - private String osDescription; @@ -104,14 +41,4 @@ System.clearProperty("assistive_technologies"); } - } - - @Override - public void afterPrefStartupHook() { - // Do nothing - } - - @Override - public void startupHook() { - // Do nothing } @@ -151,34 +78,7 @@ } - /** - * This should work for all platforms. Yeah, should. - * See PlatformHook.java for a list of reasons why this is implemented here... - */ - @Override - public String makeTooltip(String name, Shortcut sc) { - StringBuilder result = new StringBuilder(); - result.append("").append(name); - if (sc != null && !sc.getKeyText().isEmpty()) { - result.append(" (") - .append(sc.getKeyText()) - .append(")"); - } - return result.append(" ").toString(); - } - @Override public String getDefaultStyle() { return "javax.swing.plaf.metal.MetalLookAndFeel"; - } - - @Override - public boolean canFullscreen() { - return !GraphicsEnvironment.isHeadless() && - GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().isFullScreenSupported(); - } - - @Override - public boolean rename(File from, File to) { - return from.renameTo(to); } @@ -469,11 +369,4 @@ @Override - public boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert) - throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException { - // TODO setup HTTPS certificate on Unix systems - return false; - } - - @Override public File getDefaultCacheDirectory() { return new File(Main.pref.getUserDataDirectory(), "cache"); @@ -491,132 +384,3 @@ } - /** - *

Add more fallback fonts to the Java runtime, in order to get - * support for more scripts.

- * - *

The font configuration in Java doesn't include some Indic scripts, - * even though MS Windows ships with fonts that cover these unicode ranges.

- * - *

To fix this, the fontconfig.properties template is copied to the JOSM - * cache folder. Then, the additional entries are added to the font - * configuration. Finally the system property "sun.awt.fontconfig" is set - * to the customized fontconfig.properties file.

- * - *

This is a crude hack, but better than no font display at all for these languages. - * There is no guarantee, that the template file - * ($JAVA_HOME/lib/fontconfig.properties.src) matches the default - * configuration (which is in a binary format). - * Furthermore, the system property "sun.awt.fontconfig" is undocumented and - * may no longer work in future versions of Java.

- * - *

Related Java bug: JDK-8008572

- * - * @param templateFileName file name of the fontconfig.properties template file - */ - protected void extendFontconfig(String templateFileName) { - String customFontconfigFile = Main.pref.get("fontconfig.properties", null); - if (customFontconfigFile != null) { - Utils.updateSystemProperty("sun.awt.fontconfig", customFontconfigFile); - return; - } - if (!Main.pref.getBoolean("font.extended-unicode", true)) - return; - - String javaLibPath = System.getProperty("java.home") + File.separator + "lib"; - Path templateFile = FileSystems.getDefault().getPath(javaLibPath, templateFileName); - if (!Files.isReadable(templateFile)) { - Main.warn("extended font config - unable to find font config template file "+templateFile.toString()); - return; - } - try (FileInputStream fis = new FileInputStream(templateFile.toFile())) { - Properties props = new Properties(); - props.load(fis); - byte[] content = Files.readAllBytes(templateFile); - File cachePath = Main.pref.getCacheDirectory(); - Path fontconfigFile = cachePath.toPath().resolve("fontconfig.properties"); - OutputStream os = Files.newOutputStream(fontconfigFile); - os.write(content); - try (Writer w = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8))) { - Collection extrasPref = Main.pref.getListOfStructs( - "font.extended-unicode.extra-items", getAdditionalFonts(), FontEntry.class); - Collection extras = new ArrayList<>(); - w.append("\n\n# Added by JOSM to extend unicode coverage of Java font support:\n\n"); - List allCharSubsets = new ArrayList<>(); - for (FontEntry entry: extrasPref) { - Collection fontsAvail = getInstalledFonts(); - if (fontsAvail != null && fontsAvail.contains(entry.file.toUpperCase(Locale.ENGLISH))) { - if (!allCharSubsets.contains(entry.charset)) { - allCharSubsets.add(entry.charset); - extras.add(entry); - } else { - Main.trace("extended font config - already registered font for charset ''{0}'' - skipping ''{1}''", - entry.charset, entry.name); - } - } else { - Main.trace("extended font config - Font ''{0}'' not found on system - skipping", entry.name); - } - } - for (FontEntry entry: extras) { - allCharSubsets.add(entry.charset); - if ("".equals(entry.name)) { - continue; - } - String key = "allfonts." + entry.charset; - String value = entry.name; - String prevValue = props.getProperty(key); - if (prevValue != null && !prevValue.equals(value)) { - Main.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value); - } - w.append(key + '=' + value + '\n'); - } - w.append('\n'); - for (FontEntry entry: extras) { - if ("".equals(entry.name) || "".equals(entry.file)) { - continue; - } - String key = "filename." + entry.name.replace(' ', '_'); - String value = entry.file; - String prevValue = props.getProperty(key); - if (prevValue != null && !prevValue.equals(value)) { - Main.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value); - } - w.append(key + '=' + value + '\n'); - } - w.append('\n'); - String fallback = props.getProperty("sequence.fallback"); - if (fallback != null) { - w.append("sequence.fallback=" + fallback + ',' + Utils.join(",", allCharSubsets) + '\n'); - } else { - w.append("sequence.fallback=" + Utils.join(",", allCharSubsets) + '\n'); - } - } - Utils.updateSystemProperty("sun.awt.fontconfig", fontconfigFile.toString()); - } catch (IOException ex) { - Main.error(ex); - } - } - - /** - * Get a list of fonts that are installed on the system. - * - * Must be done without triggering the Java Font initialization. - * (See {@link #extendFontconfig(java.lang.String)}, have to set system - * property first, which is then read by sun.awt.FontConfiguration upon initialization.) - * - * @return list of file names - */ - public Collection getInstalledFonts() { - throw new UnsupportedOperationException(); - } - - /** - * Get default list of additional fonts to add to the configuration. - * - * Java will choose thee first font in the list that can render a certain character. - * - * @return list of FontEntry objects - */ - public Collection getAdditionalFonts() { - throw new UnsupportedOperationException(); - } } Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 11155) +++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 11156) @@ -29,6 +29,12 @@ import java.awt.GraphicsEnvironment; +import java.io.BufferedWriter; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.nio.charset.StandardCharsets; import java.nio.file.DirectoryStream; import java.nio.file.FileSystems; @@ -51,8 +57,10 @@ import java.util.List; import java.util.Locale; +import java.util.Properties; import javax.swing.JOptionPane; import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Preferences; /** @@ -60,9 +68,49 @@ * @since 1023 */ -public class PlatformHookWindows extends PlatformHookUnixoid { - - @Override - public void startupHook() { - // Do nothing +public class PlatformHookWindows implements PlatformHook { + + /** + * Simple data class to hold information about a font. + * + * Used for fontconfig.properties files. + */ + public static class FontEntry { + /** + * The character subset. Basically a free identifier, but should be unique. + */ + @Preferences.pref + public String charset; + + /** + * Platform font name. + */ + @Preferences.pref + @Preferences.writeExplicitly + public String name = ""; + + /** + * File name. + */ + @Preferences.pref + @Preferences.writeExplicitly + public String file = ""; + + /** + * Constructs a new {@code FontEntry}. + */ + public FontEntry() { + } + + /** + * Constructs a new {@code FontEntry}. + * @param charset The character subset. Basically a free identifier, but should be unique + * @param name Platform font name + * @param file File name + */ + public FontEntry(String charset, String name, String file) { + this.charset = charset; + this.name = name; + this.file = file; + } } @@ -319,5 +367,125 @@ @Override - public Collection getInstalledFonts() { + public File getDefaultUserDataDirectory() { + // Use preferences directory by default + return Main.pref.getPreferencesDirectory(); + } + + /** + *

Add more fallback fonts to the Java runtime, in order to get + * support for more scripts.

+ * + *

The font configuration in Java doesn't include some Indic scripts, + * even though MS Windows ships with fonts that cover these unicode ranges.

+ * + *

To fix this, the fontconfig.properties template is copied to the JOSM + * cache folder. Then, the additional entries are added to the font + * configuration. Finally the system property "sun.awt.fontconfig" is set + * to the customized fontconfig.properties file.

+ * + *

This is a crude hack, but better than no font display at all for these languages. + * There is no guarantee, that the template file + * ($JAVA_HOME/lib/fontconfig.properties.src) matches the default + * configuration (which is in a binary format). + * Furthermore, the system property "sun.awt.fontconfig" is undocumented and + * may no longer work in future versions of Java.

+ * + *

Related Java bug: JDK-8008572

+ * + * @param templateFileName file name of the fontconfig.properties template file + */ + protected void extendFontconfig(String templateFileName) { + String customFontconfigFile = Main.pref.get("fontconfig.properties", null); + if (customFontconfigFile != null) { + Utils.updateSystemProperty("sun.awt.fontconfig", customFontconfigFile); + return; + } + if (!Main.pref.getBoolean("font.extended-unicode", true)) + return; + + String javaLibPath = System.getProperty("java.home") + File.separator + "lib"; + Path templateFile = FileSystems.getDefault().getPath(javaLibPath, templateFileName); + if (!Files.isReadable(templateFile)) { + Main.warn("extended font config - unable to find font config template file "+templateFile.toString()); + return; + } + try (FileInputStream fis = new FileInputStream(templateFile.toFile())) { + Properties props = new Properties(); + props.load(fis); + byte[] content = Files.readAllBytes(templateFile); + File cachePath = Main.pref.getCacheDirectory(); + Path fontconfigFile = cachePath.toPath().resolve("fontconfig.properties"); + OutputStream os = Files.newOutputStream(fontconfigFile); + os.write(content); + try (Writer w = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8))) { + Collection extrasPref = Main.pref.getListOfStructs( + "font.extended-unicode.extra-items", getAdditionalFonts(), FontEntry.class); + Collection extras = new ArrayList<>(); + w.append("\n\n# Added by JOSM to extend unicode coverage of Java font support:\n\n"); + List allCharSubsets = new ArrayList<>(); + for (FontEntry entry: extrasPref) { + Collection fontsAvail = getInstalledFonts(); + if (fontsAvail != null && fontsAvail.contains(entry.file.toUpperCase(Locale.ENGLISH))) { + if (!allCharSubsets.contains(entry.charset)) { + allCharSubsets.add(entry.charset); + extras.add(entry); + } else { + Main.trace("extended font config - already registered font for charset ''{0}'' - skipping ''{1}''", + entry.charset, entry.name); + } + } else { + Main.trace("extended font config - Font ''{0}'' not found on system - skipping", entry.name); + } + } + for (FontEntry entry: extras) { + allCharSubsets.add(entry.charset); + if ("".equals(entry.name)) { + continue; + } + String key = "allfonts." + entry.charset; + String value = entry.name; + String prevValue = props.getProperty(key); + if (prevValue != null && !prevValue.equals(value)) { + Main.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value); + } + w.append(key + '=' + value + '\n'); + } + w.append('\n'); + for (FontEntry entry: extras) { + if ("".equals(entry.name) || "".equals(entry.file)) { + continue; + } + String key = "filename." + entry.name.replace(' ', '_'); + String value = entry.file; + String prevValue = props.getProperty(key); + if (prevValue != null && !prevValue.equals(value)) { + Main.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value); + } + w.append(key + '=' + value + '\n'); + } + w.append('\n'); + String fallback = props.getProperty("sequence.fallback"); + if (fallback != null) { + w.append("sequence.fallback=" + fallback + ',' + Utils.join(",", allCharSubsets) + '\n'); + } else { + w.append("sequence.fallback=" + Utils.join(",", allCharSubsets) + '\n'); + } + } + Utils.updateSystemProperty("sun.awt.fontconfig", fontconfigFile.toString()); + } catch (IOException ex) { + Main.error(ex); + } + } + + /** + * Get a list of fonts that are installed on the system. + * + * Must be done without triggering the Java Font initialization. + * (See {@link #extendFontconfig(java.lang.String)}, have to set system + * property first, which is then read by sun.awt.FontConfiguration upon initialization.) + * + * @return list of file names + */ + protected Collection getInstalledFonts() { // Cannot use GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames() // because we have to set the system property before Java initializes its fonts. @@ -341,6 +509,12 @@ } - @Override - public Collection getAdditionalFonts() { + /** + * Get default list of additional fonts to add to the configuration. + * + * Java will choose thee first font in the list that can render a certain character. + * + * @return list of FontEntry objects + */ + protected Collection getAdditionalFonts() { Collection def = new ArrayList<>(33); def.add(new FontEntry("devanagari", "", "")); // just include in fallback list font already defined in template