From 8ee3464d8064ebe1694c7b20177878c0d9961451 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 9 Sep 2010 17:54:41 -0700
Subject: altosui: Display error dialog when AltOS JNI library can't be loaded

Having an error dialog appear at application startup seems better than
simply failing to present the device dialog later on.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 ao-tools/altosui/AltosUI.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'ao-tools/altosui/AltosUI.java')

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 3aaeb888..ca587b25 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -70,8 +70,22 @@ public class AltosUI extends JFrame {
 
 	public AltosVoice voice = new AltosVoice();
 
+	public static boolean load_library(Frame frame) {
+		if (!AltosDevice.load_library()) {
+			JOptionPane.showMessageDialog(frame,
+						      String.format("No AltOS library in \"%s\"",
+								    System.getProperty("java.library.path","<undefined>")),
+						      "Cannot load device access library",
+						      JOptionPane.ERROR_MESSAGE);
+			return false;
+		}
+		return true;
+	}
+
 	public AltosUI() {
 
+		load_library(null);
+
 		String[] statusNames = { "Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
 		Object[][] statusData = { { "0", "pad", "-50", "0" } };
 
-- 
cgit v1.2.3