X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroPeak.java;h=1b7327e4ef161249baf139c89fb07709d7f6309d;hp=792231768808a04011246d2561c29b637bffb8ef;hb=73ce3f73526edfabccd3b98e6e67de6d82a84b63;hpb=106d212ff5920c39d95751ef6249dc141970412c

diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java
index 79223176..1b7327e4 100644
--- a/micropeak/MicroPeak.java
+++ b/micropeak/MicroPeak.java
@@ -23,8 +23,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_9.*;
+import org.altusmetrum.altosuilib_9.*;
 
 public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
 
@@ -65,6 +65,10 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 		try {
 			data = new MicroData((InputStream) fis, filename.getName());
 			AltosUIPreferences.set_last_logdir(filename);
+		} catch (MicroData.NonHexcharException nhe) {
+			data = null;
+		} catch (MicroData.FileEndedException nhe) {
+			data = null;
 		} catch (InterruptedException ie) {
 			data = null;
 		} finally {
@@ -103,7 +107,7 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 
 	private void DownloadData() {
 		AltosDevice	device = MicroDeviceDialog.show(this);
-		
+
 		if (device != null)
 			new MicroDownload(this, device);
 	}
@@ -124,7 +128,7 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 		if (save.runDialog())
 			SetName(data.name);
 	}
-	
+
 	private void Export() {
 		if (data == null) {
 			no_data();
@@ -186,10 +190,25 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 	public void itemStateChanged(ItemEvent e) {
 	}
 
+	/* OSXAdapter interfaces */
+	public void macosx_file_handler(String path) {
+		CommandGraph(new File(path));
+	}
+
+	public void macosx_quit_handler() {
+		System.exit(0);
+	}
+
+	public void macosx_preferences_handler() {
+		Preferences();
+	}
+
 	public MicroPeak() {
 
 		++number_of_windows;
 
+		register_for_macosx_events();
+
 		AltosUIPreferences.set_component(this);
 
 		container = getContentPane();
@@ -231,6 +250,10 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 		fileMenu.add(exitAction);
 		exitAction.addActionListener(this);
 
+		JButton downloadButton = new JButton ("Download");
+		downloadButton.addActionListener(this);
+		menuBar.add(downloadButton);
+
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 		addWindowListener(new WindowAdapter() {
 			@Override