Add DLFS Browser to Main GUI

convex-gui/src/main/java/convex/gui/MainGUI.java

@@ -27,6 +27,7 @@
 import convex.gui.components.AbstractGUI;
 import convex.gui.components.ActionPanel;
 import convex.gui.components.Toast;
+import convex.gui.dlfs.DLFSBrowser;
 import convex.gui.manager.mainpanels.HomePanel;
 import convex.gui.tools.HackerTools;
 import convex.gui.utils.Toolkit;
@@ -49,6 +50,9 @@ public MainGUI() {
 		JComponent testNet=createLaunchButton("Launch TestNet",Toolkit.TESTNET_ICON,this::launchTestNet);
 		actionPanel.add(testNet);
 
+		JComponent latticeFS=createLaunchButton("Lattice Filesystem",Toolkit.DLFS_ICON,this::launchDLFS);
+		actionPanel.add(latticeFS);
+
 		JComponent terminal=createLaunchButton("Convex Terminal",Toolkit.TERMINAL_ICON,this::launchTerminalClient);
 		actionPanel.add(terminal);
 
@@ -64,6 +68,10 @@ public MainGUI() {
 		add(actionPanel,"dock south");
 	}
 
+	public void launchDLFS() {
+		new DLFSBrowser().run();
+	}
+
 	public void launchTestNet() {
 		JPanel pan=new JPanel();
 		pan.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
@@ -182,7 +190,6 @@ public JPanel createLaunchButton(String label, ImageIcon icon, Runnable cmd) {
 	 * @param args Command line args
 	 */
 	public static void main(String[] args) {
-		// call to set up Look and Feel
 		Toolkit.init();
 		new MainGUI().run();
 	}

convex-gui/src/main/java/convex/gui/PeerGUI.java

@@ -31,6 +31,7 @@
 import convex.core.init.Init;
 import convex.core.store.AStore;
 import convex.core.store.Stores;
+import convex.core.util.ThreadUtils;
 import convex.core.util.Utils;
 import convex.gui.components.AbstractGUI;
 import convex.gui.components.models.StateModel;
@@ -176,17 +177,18 @@ public PeerGUI(int peerCount, AKeyPair genesis) {
 
 		});
 
-		updateThread.start();
+		ThreadUtils.runVirtual(updateThread);
 	}
 
 	private boolean updateRunning = true;
 
 	private long cp = 0;
 	private long maxBlock=0;
 
-	private Thread updateThread = new Thread(new Runnable() {
+	private Runnable updateThread = new Runnable() {
 		@Override
 		public void run() {
+			Thread.currentThread().setName("PeerGUI update thread");
 			while (updateRunning) {
 				try {
 					Thread.sleep(100);
@@ -226,7 +228,7 @@ public void run() {
 			}
 			log.debug("GUI Peer Manager update thread ended");
 		}
-	}, "GUI Manager state update thread");
+	};
 
 	public DefaultListModel<ConvexLocal> peerList = new DefaultListModel<ConvexLocal>();
 

convex-gui/src/main/java/convex/gui/components/AbstractGUI.java

@@ -20,6 +20,9 @@ public class AbstractGUI extends JPanel implements Runnable {
 
 	@Override
 	public void run() {
+		// call to set up Look and Feel
+		Toolkit.init();
+
 		EventQueue.invokeLater(new Runnable() {
 			@Override
 			public void run() {

convex-gui/src/main/java/convex/gui/dlfs/DLFSBrowser.java

@@ -74,6 +74,12 @@ public DLFSBrowser(DLFSLocal drive) {
 		getFrame().setJMenuBar(menuBar);
 
 	}
+
+
+	public DLFSBrowser() {
+		this(createDemoDrive());
+	}
+
 
 	protected JMenuItem makeMenu(String name,Runnable op) {
 		JMenuItem mi= new JMenuItem(name);
@@ -125,8 +131,7 @@ public static void main(String[] args) {
 		// call to set up Look and Feel
 		Toolkit.init();
 
-		DLFSLocal demoDrive=createDemoDrive();
-		DLFSBrowser gui=new DLFSBrowser(demoDrive);
+		DLFSBrowser gui=new DLFSBrowser();
 		gui.run();
 	}
 

convex-gui/src/main/java/convex/gui/utils/Toolkit.java

@@ -114,6 +114,7 @@ public class Toolkit {
 	public static final ImageIcon TERMINAL_ICON = scaledIcon(128, "/images/terminal.png");
 	public static final ImageIcon ECOSYSTEM_ICON = scaledIcon(128, "/images/ecosystem.png");
 	public static final ImageIcon WALLET_ICON = scaledIcon(128, "/images/wallet.png");
+	public static final ImageIcon DLFS_ICON = scaledIcon(128, "/images/filesystem.png");
 
 	public static ImageIcon scaledIcon(int size, String resourcePath) {
 		java.net.URL imgURL = Toolkit.class.getResource(resourcePath);