Changeset 1526

Timestamp:

05/06/20 10:52:22 (4 years ago)

Author:

bnemhaus

Message:

org.expeditee.gui.Browser ->
org.expeditee.items.widgets.JfxBrowser ->
Fixed exception that was sometimes happening when Expeditee was closed after a JfxBrowser had been in use. Issue was that JfxBrowser runs operations on JFXThread which needed to be shut down nicely. Sometimes when Expeditee gets closed, and the JfxBrowser had something run in another thread, an exception would be caused when the JFXThread got terminated unexpectedly while running something. The solution was to detect if the JfxBrowser ever gets used, and if it is used then Expeditee must nicely close JFX thread as part of its shut down process.

Location:

trunk/src/org/expeditee

Files:

• gui/Browser.java (modified) (4 diffs)
• items/widgets/JfxBrowser.java (modified) (3 diffs)

trunk/src/org/expeditee/gui/Browser.java

@@ -48 +48 @@
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Text;
+import org.expeditee.items.widgets.JfxBrowser;
 import org.expeditee.items.widgets.WidgetCacheManager;
 import org.expeditee.network.FrameShare;
@@ -57 +58 @@
 import org.expeditee.taskmanagement.SaveStateChangedEvent;
 import org.expeditee.taskmanagement.SaveStateChangedEventListener;
+
+import javafx.application.Platform;
 
 /**
@@ -428 +431 @@
                                 FrameShare.getInstance().finalise();
                         }
-
+                        
+                        // Shut down the Java FX Platform.  
+                        if (JfxBrowser.JFXBROWSER_IN_USE) {
+                                MessageBay.displayMessage("Detected use of JFX Browser.  Stopping Java FX Platform...");
+                                Platform.exit();
+                        }
+                        
                         MessageBay.displayMessage("System exited");
 
@@ -441 +450 @@
                         File file = new File(FrameIO.MESSAGES_PATH + "messages");
                         file.mkdirs();
-
+                        
                         Browser._hasExited = true;
                         

trunk/src/org/expeditee/items/widgets/JfxBrowser.java

@@ -103 +103 @@
 public class JfxBrowser extends DataFrameWidget {
         
+        public static boolean JFXBROWSER_IN_USE = false;
+        
         private static final String BACK = "back";
         private static final String FORWARD = "forward";
@@ -136 +138 @@
                 
                 Font.loadFont(ClassLoader.getSystemResourceAsStream("org/expeditee/assets/resources/fonts/FontAwesome/fontawesome-webfont.ttf"), 12);
-                
                 try {
                 MouseEvent_x = MouseEvent.class.getDeclaredField("x");
@@ -179 +180 @@
                         }
                 });
+                
+                JFXBROWSER_IN_USE = true;
         }