From c058ec2d6070458a0b7d3ef56041e985412ee565 Mon Sep 17 00:00:00 2001
From: Mike Beattie <mike@ethernal.org>
Date: Tue, 18 Sep 2012 23:46:17 +1200
Subject: altos{lib,ui,droid}: move OS specific code out of altoslib

This is to allow the usage of AltosLog on Android - no swing, so
we need to push the "home directory" code used to pick a default
telemetry logging path - using the PreferencesBackend interface
for now.

Signed-off-by: Mike Beattie <mike@ethernal.org>
---
 altoslib/AltosPreferences.java        | 4 +---
 altoslib/AltosPreferencesBackend.java | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'altoslib')

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index a82ea3f6..47196d6e 100644
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -19,7 +19,6 @@ package org.altusmetrum.AltosLib;
 
 import java.io.*;
 import java.util.*;
-import javax.swing.filechooser.FileSystemView;
 
 public class AltosPreferences {
 	public static AltosPreferencesBackend backend = null;
@@ -145,8 +144,7 @@ public class AltosPreferences {
 		if (logdir_string != null)
 			logdir = new File(logdir_string);
 		else {
-			/* Use the file system view default directory */
-			logdir = new File(FileSystemView.getFileSystemView().getDefaultDirectory(), logdirName);
+			logdir = new File(backend.homeDirectory(), logdirName);
 			if (!logdir.exists())
 				logdir.mkdirs();
 		}
diff --git a/altoslib/AltosPreferencesBackend.java b/altoslib/AltosPreferencesBackend.java
index 3fc4b0aa..a1184c0b 100644
--- a/altoslib/AltosPreferencesBackend.java
+++ b/altoslib/AltosPreferencesBackend.java
@@ -17,6 +17,8 @@
 
 package org.altusmetrum.AltosLib;
 
+import java.io.File;
+
 public interface AltosPreferencesBackend {
 
 	public String  getString(String key, String def);
@@ -38,4 +40,6 @@ public interface AltosPreferencesBackend {
 	public void    remove(String key);
 
 	public void    flush();
+
+	public File homeDirectory();
 }
-- 
cgit v1.2.3


From 0541201d4afe3e5d7913465e1db10e586d7182bb Mon Sep 17 00:00:00 2001
From: Mike Beattie <mike@ethernal.org>
Date: Tue, 18 Sep 2012 23:47:06 +1200
Subject: altoslib: make parts of AltosLog public for usage outside altoslib.

Signed-off-by: Mike Beattie <mike@ethernal.org>
---
 altoslib/AltosLog.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'altoslib')

diff --git a/altoslib/AltosLog.java b/altoslib/AltosLog.java
index 3c124700..1c7069ce 100644
--- a/altoslib/AltosLog.java
+++ b/altoslib/AltosLog.java
@@ -25,7 +25,7 @@ import java.util.concurrent.LinkedBlockingQueue;
  * This creates a thread to capture telemetry data and write it to
  * a log file
  */
-class AltosLog implements Runnable {
+public class AltosLog implements Runnable {
 
 	LinkedBlockingQueue<AltosLine>	input_queue;
 	LinkedBlockingQueue<String>	pending_queue;
@@ -45,7 +45,7 @@ class AltosLog implements Runnable {
 		}
 	}
 
-	void close() {
+	public void close() {
 		close_log_file();
 		if (log_thread != null) {
 			log_thread.interrupt();
@@ -53,7 +53,7 @@ class AltosLog implements Runnable {
 		}
 	}
 
-	File file() {
+	public File file() {
 		return file;
 	}
 
-- 
cgit v1.2.3