WebSVN - OpenConcerto - Diff - Rev 144 and 180 - /trunk/OpenConcerto/src/org/openconcerto/utils/DesktopEnvironment.java

 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.nio.charset.Charset;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.RunnableFuture;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import javax.swing.SwingUtilities;
 import javax.swing.filechooser.FileSystemView;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
+import net.jcip.annotations.GuardedBy;
+import net.jcip.annotations.ThreadSafe;
 /**
  * A desktop environment like Gnome or MacOS.
+ *
  * @author Sylvain CUAZ
  * @see #getDE()
  */
+@ThreadSafe
 public abstract class DesktopEnvironment {
     static public final class Gnome extends DesktopEnvironment {
         static private final String getTextContent(final Element parentElem, final String childName) {
+    }
     static public final class Mac extends DEisOS {
         // From CarbonCore/Folders.h
-        private static final String kDocumentsDirectory = "docs";
+        public static final String kDocumentsDirectory = "docs";
-        private static final String kPreferencesDirectory = "pref";
+        public static final String kPreferencesDirectory = "pref";
         private static Class<?> FileManagerClass;
         private static Short kUserDomain;
         private static Method OSTypeToInt;
         private static Class<?> getFileManagerClass() {
             return FileManagerClass;
+        }
         @Override
         public File getDocumentsFolder() {
-            return getFolder(kDocumentsDirectory);
-        }
-        @Override
-        public File getPreferencesFolder(String appName) {
-            return new File(getFolder(kPreferencesDirectory), appName);
+            return new File(System.getProperty("user.home"), "Documents/");
+        }
+        // There was a warning until JRE v16, now "--add-exports
+        // java.desktop/com.apple.eio=ALL-UNNAMED" is needed. Further this needs the EDT which is
+        // undesirable just to get some paths.
+        // https://bugs.openjdk.java.net/browse/JDK-8187981
+        @Deprecated
         public File getFolder(String type) {
             try {
                 final Method findFolder = getFileManagerClass().getMethod("findFolder", Short.TYPE, Integer.TYPE);
-                final String path = (String) findFolder.invoke(null, kUserDomain, OSTypeToInt.invoke(null, type));
+                final RunnableFuture<String> f = new FutureTask<>(() -> (String) findFolder.invoke(null, kUserDomain, OSTypeToInt.invoke(null, type)));
+                // EDT needed at least for JRE v14-16 on macOS 10.15, otherwise the VM crashes :
+                // Problematic frame: __NSAssertMainEventQueueIsCurrentEventQueue_block_invoke or
+                // "The current event queue and the main event queue are not the same. This is
+                // probably because _TSGetMainThread was called for the first time off the main
+                // thread."
+                if (SwingUtilities.isEventDispatchThread())
+                    f.run();
+                else
+                    SwingUtilities.invokeLater(f);
+                final String path = f.get();
                 return new File(path);
             } catch (RuntimeException e) {
                 throw e;
             } catch (Exception e) {
                 throw new IllegalStateException(e);
                 return new Gnome(de);
+        }
         return new Unknown();
+    }
+    @GuardedBy("DesktopEnvironment.class")
     private static DesktopEnvironment DE = null;
-    public static final DesktopEnvironment getDE() {
+    public synchronized static final DesktopEnvironment getDE() {
         if (DE == null) {
             DE = detectDE();
+        }
         return DE;
+    }
-    public static final void resetDE() {
+    public synchronized static final void resetDE() {
         DE = null;
+    }
+    @GuardedBy("this")
     private String version;
     private DesktopEnvironment() {
         this.version = null;
+    }
     protected abstract String findVersion();
-    public final String getVersion() {
+    public synchronized final String getVersion() {
         if (this.version == null)
             this.version = this.findVersion();
         return this.version;
+    }
     // where to write user-visible files (e.g. spreadsheets, exports)
     public File getDocumentsFolder() {
         return FileSystemView.getFileSystemView().getDefaultDirectory();
+    }
-    /**
-     * Where the configuration files are stored.
-     *
-     * @param appName the name of application.
-     * @return the preferences folder.
-     * @deprecated kept around to migrate existing files, but otherwise use {@link BaseDirs}.
-     */
-    public File getPreferencesFolder(final String appName) {
-        return new File(System.getProperty("user.home"), "." + appName);
-    }
     // on some systems arguments are not passed correctly by ProcessBuilder
     public String quoteParamForExec(String s) {
         return s;
+    }

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/utils/DesktopEnvironment.java - Rev 144 → 180