altosui: Move AltosEepromChunk.java to lib

Also fixes install issues with split lib

Signed-off-by: Keith Packard <keithp@keithp.com>

4 files changed, 13 insertions, 14 deletions

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 67e9ca73..1a5275b1 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -33,7 +33,6 @@ altosui_JAVA = \
 	AltosDevice.java \
 	AltosUSBDevice.java \
 	AltosDisplayThread.java \
-	AltosEepromChunk.java \
 	AltosEepromDelete.java \
 	AltosEepromDownload.java \
 	AltosEepromList.java \
@@ -254,7 +253,7 @@ altosui: Makefile
 
 altosui-test: Makefile
 	echo "#!/bin/sh" > $@
-	echo 'exec java -cp ":altoslib/*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+	echo 'exec java -cp "./*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
 	chmod +x $@
 
 altosui-jdb: Makefile
diff --git a/altosui/altoslib/Makefile.am b/altosui/altoslib/Makefile.am
index cbf716b0..cce9b4c4 100644
--- a/altosui/altoslib/Makefile.am
+++ b/altosui/altoslib/Makefile.am
@@ -14,6 +14,7 @@ AltosLib_JAVA = \
 	$(SRC)/AltosConfigData.java \
 	$(SRC)/AltosConvert.java \
 	$(SRC)/AltosCRCException.java \
+	$(SRC)/AltosEepromChunk.java \
 	$(SRC)/AltosFrequency.java \
 	$(SRC)/AltosGPS.java \
 	$(SRC)/AltosGPSSat.java \
@@ -44,13 +45,11 @@ all-local: $(JAR)
 clean-local:
 	-rm -rf bin $(JAR)
 
-altosuidir=$(datadir)/java
-
-install-altosuiJAVA: $(JAR)
+install-AltosLibJAVA: $(JAR)
 	@$(NORMAL_INSTALL)
-	test -z "$(altosuidir)" || $(MKDIR_P) "$(DESTDIR)$(altosuidir)"
-	echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuidir)/$(JAR)"; \
-	$(INSTALL_DATA) "$<" "$(DESTDIR)$(altosuidir)"
+	test -z "$(AltosLibdir)" || $(MKDIR_P) "$(DESTDIR)$(AltosLibdir)"
+	echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(AltosLibdir)/$(JAR)"; \
+	$(INSTALL_DATA) "$<" "$(DESTDIR)$(AltosLibdir)"
 
 bin:
 	mkdir -p bin
diff --git a/altosui/AltosEepromChunk.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromChunk.java
index f6b56ddf..5cc5cea0 100644
--- a/altosui/AltosEepromChunk.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromChunk.java
@@ -15,13 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosEepromChunk {
 
@@ -60,7 +59,7 @@ public class AltosEepromChunk {
 		return true;
 	}
 
-	public AltosEepromChunk(AltosSerial serial_line, int block, boolean flush)
+	public AltosEepromChunk(AltosLink link, int block, boolean flush)
 		throws TimeoutException, InterruptedException {
 
 		int	offset;
@@ -68,12 +67,12 @@ public class AltosEepromChunk {
 		data = new int[chunk_size];
 		address = block * chunk_size;
 		if (flush)
-			serial_line.flush_input();
-		serial_line.printf("e %x\n", block);
+			link.flush_input();
+		link.printf("e %x\n", block);
 
 		for (offset = 0; offset < chunk_size; offset += per_line) {
 			try {
-				String	line = serial_line.get_reply(5000);
+				String	line = link.get_reply(5000);
 
 				if (line == null)
 					throw new TimeoutException();
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLink.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLink.java
index 80f3d712..9a23b306 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLink.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLink.java
@@ -23,4 +23,6 @@ public interface AltosLink {
 	public String get_reply() throws InterruptedException;
 
 	public String get_reply(int timeout) throws InterruptedException;
+
+	public void flush_input() throws InterruptedException;
 }