Changeset 12695 in josm for trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

Timestamp:

2017-08-29T00:16:25+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - refactor PlatformHookOsx so that all GUI actions are performed in MainApplication and only macOS-specific stuff remains in platform hook

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified) (6 diffs)

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

@@ -17 +17 @@
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.Executors;
+import java.util.Objects;
 
 import javax.swing.UIManager;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.OpenFileAction.OpenFileTask;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.io.OsmTransferException;
-import org.xml.sax.SAXException;
 
 /**
@@ -36 +32 @@
 
     private String oSBuildNumber;
+
+    private NativeOsCallback osCallback;
 
     @Override
@@ -138 +136 @@
     }
 
+    @Override
+    public void setNativeOsCallback(NativeOsCallback callback) {
+        osCallback = Objects.requireNonNull(callback);
+    }
+
     @SuppressWarnings("unchecked")
     @Override
@@ -150 +153 @@
                     Object oFiles = args[0].getClass().getMethod("getFiles").invoke(args[0]);
                     if (oFiles instanceof List) {
-                        Executors.newSingleThreadExecutor(Utils.newThreadFactory("openFiles-%d", Thread.NORM_PRIORITY)).submit(
-                                new OpenFileTask((List<File>) oFiles, null) {
-                            @Override
-                            protected void realRun() throws SAXException, IOException, OsmTransferException {
-                                // Wait for JOSM startup is advanced enough to load a file
-                                while (Main.parent == null || !Main.parent.isVisible()) {
-                                    try {
-                                        Thread.sleep(25);
-                                    } catch (InterruptedException e) {
-                                        Logging.warn(e);
-                                        Thread.currentThread().interrupt();
-                                    }
-                                }
-                                super.realRun();
-                            }
-                        });
+                        osCallback.openFiles((List<File>) oFiles);
                     }
                 } catch (ReflectiveOperationException | SecurityException | IllegalArgumentException ex) {
@@ -173 +161 @@
             break;
         case "handleQuitRequestWith":
-            boolean closed = MainApplication.exitJosm(false, 0, null);
+            boolean closed = osCallback.handleQuitRequest();
             if (args[1] != null) {
                 try {
@@ -185 +173 @@
             break;
         case "handleAbout":
-            MainApplication.getMenu().about.actionPerformed(null);
+            osCallback.handleAbout();
             break;
         case "handlePreferences":
-            MainApplication.getMenu().preferences.actionPerformed(null);
+            osCallback.handlePreferences();
             break;
         default: