Fix GUI issue trying to join peer with locked key

Author: mikera

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

@@ -88,11 +88,19 @@ public static PeerGUI launchPeerGUI(int peerNum, AKeyPair genesisKey) throws Int
 		return manager;
 	}
 
-	public static PeerGUI launchPeerGUI(InetSocketAddress sa, AWalletEntry we) throws InterruptedException, PeerException {
+	/**
+	 * LAunch a peer, joining an existing network
+	 * @param sa Socket address of source peer to sync with
+	 * @param kp Key pair for new peer
+	 * @return
+	 * @throws InterruptedException
+	 * @throws PeerException
+	 */
+	public static PeerGUI launchPeerGUI(InetSocketAddress sa, AKeyPair kp) throws InterruptedException, PeerException {
 		DefaultListModel<ConvexLocal> peerList=new DefaultListModel<>();
 
 		HashMap<Keyword, Object> config=new HashMap<>();
-		config.put(Keywords.KEYPAIR,we.getKeyPair());
+		config.put(Keywords.KEYPAIR,kp);
 		config.put(Keywords.SOURCE,sa);
 		Server server=API.launchPeer(config);
 		ConvexLocal convex=ConvexLocal.connect(server);

convex-gui/src/main/java/convex/gui/peer/PeerLaunchDialog.java

@@ -126,8 +126,15 @@ public static void runLaunchDialog(JComponent parent) {
 
 		    		AWalletEntry we=peerKeyField.getWalletEntry();
 		    		if (we==null) throw new IllegalArgumentException("No peer key selected");
+		    		if (we.isLocked()) {
+						boolean unlocked= UnlockWalletDialog.offerUnlock(parent,we);
+						if (!unlocked) {
+							Toast.display(parent, "Launch cancelled: Locked peer key", Color.RED);
+							return;
+						}			    		
+		    		}
 
-		    		PeerGUI.launchPeerGUI(sa,we);
+		    		PeerGUI.launchPeerGUI(sa,we.getKeyPair());
 		    	} else if (selected==loadPanel) {
 		    		File f=backupPicker.getFile();
 		    		AKeyPair kp=null; // TODO;

convex-gui/src/main/java/convex/gui/tools/MessageFormatPanel.java

@@ -59,6 +59,7 @@ public MessageFormatPanel() {
 
 		dataArea = new CodePane();
 		dataArea.setToolTipText("Enter data objects here");
+		dataArea.setEditable(true);
 		dataArea.setMaxColumns(128);
 		dataArea.setFont(Toolkit.MONO_FONT);
 		// dataArea.setLineWrap(true);