- Timestamp:
- 05/06/20 10:52:22 (4 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/Browser.java
r1521 r1526 48 48 import org.expeditee.items.ItemUtils; 49 49 import org.expeditee.items.Text; 50 import org.expeditee.items.widgets.JfxBrowser; 50 51 import org.expeditee.items.widgets.WidgetCacheManager; 51 52 import org.expeditee.network.FrameShare; … … 57 58 import org.expeditee.taskmanagement.SaveStateChangedEvent; 58 59 import org.expeditee.taskmanagement.SaveStateChangedEventListener; 60 61 import javafx.application.Platform; 59 62 60 63 /** … … 428 431 FrameShare.getInstance().finalise(); 429 432 } 430 433 434 // Shut down the Java FX Platform. 435 if (JfxBrowser.JFXBROWSER_IN_USE) { 436 MessageBay.displayMessage("Detected use of JFX Browser. Stopping Java FX Platform..."); 437 Platform.exit(); 438 } 439 431 440 MessageBay.displayMessage("System exited"); 432 441 … … 441 450 File file = new File(FrameIO.MESSAGES_PATH + "messages"); 442 451 file.mkdirs(); 443 452 444 453 Browser._hasExited = true; 445 454 -
trunk/src/org/expeditee/items/widgets/JfxBrowser.java
r1102 r1526 103 103 public class JfxBrowser extends DataFrameWidget { 104 104 105 public static boolean JFXBROWSER_IN_USE = false; 106 105 107 private static final String BACK = "back"; 106 108 private static final String FORWARD = "forward"; … … 136 138 137 139 Font.loadFont(ClassLoader.getSystemResourceAsStream("org/expeditee/assets/resources/fonts/FontAwesome/fontawesome-webfont.ttf"), 12); 138 139 140 try { 140 141 MouseEvent_x = MouseEvent.class.getDeclaredField("x"); … … 179 180 } 180 181 }); 182 183 JFXBROWSER_IN_USE = true; 181 184 } 182 185
Note:
See TracChangeset
for help on using the changeset viewer.