X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroPeak.java;h=9023f452df7f4d4578beda8b13b857c1351723e2;hp=cb1c68cbba2eb7afbc55fe3580a0ff5bce1f5d2f;hb=80fd7f7bef5320ce86048d74dc4a72e1ec361120;hpb=4ff54bb96f6c00c0c2c7dd32f81403bac331621a

diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java
index cb1c68cb..9023f452 100644
--- a/micropeak/MicroPeak.java
+++ b/micropeak/MicroPeak.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,8 +24,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_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
 
@@ -65,6 +66,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 +108,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 +129,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 +191,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();