Merge branch 'branch-1.3' into debian

Conflicts:
	ChangeLog
	altoslib/AltosRecordMM.java
	altosui/Makefile.am
	altosui/altos-windows.nsi.in
	configure.ac
	debian/changelog
	debian/control
	doc/Makefile
	doc/altusmetrum.xsl
	doc/release-notes-1.2.1.xsl
	doc/release-notes-1.2.xsl

11 files changed, 42 insertions, 21 deletions

diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java
index 867b0384..a38cba63 100644
--- a/altosuilib/AltosUIAxis.java
+++ b/altosuilib/AltosUIAxis.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIEnable.java b/altosuilib/AltosUIEnable.java
index 55486dea..84803c0e 100644
--- a/altosuilib/AltosUIEnable.java
+++ b/altosuilib/AltosUIEnable.java
@@ -23,7 +23,7 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIGraph.java b/altosuilib/AltosUIGraph.java
index 5f3a2eef..ef0cc677 100644
--- a/altosuilib/AltosUIGraph.java
+++ b/altosuilib/AltosUIGraph.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIGrapher.java b/altosuilib/AltosUIGrapher.java
index 8f0ce801..d826072f 100644
--- a/altosuilib/AltosUIGrapher.java
+++ b/altosuilib/AltosUIGrapher.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 1b121405..9fcaf6d4 100644
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -20,7 +20,7 @@ package org.altusmetrum.altosuilib_1;
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 public class AltosUILib extends AltosLib {
 
diff --git a/altosuilib/AltosUIMarker.java b/altosuilib/AltosUIMarker.java
index 0949be6f..e4262abd 100644
--- a/altosuilib/AltosUIMarker.java
+++ b/altosuilib/AltosUIMarker.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIPreferences.java b/altosuilib/AltosUIPreferences.java
index 49321bce..fc14f24b 100644
--- a/altosuilib/AltosUIPreferences.java
+++ b/altosuilib/AltosUIPreferences.java
@@ -21,7 +21,7 @@ import java.io.*;
 import java.util.*;
 import java.awt.Component;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 public class AltosUIPreferences extends AltosPreferences {
 
diff --git a/altosuilib/AltosUIPreferencesBackend.java b/altosuilib/AltosUIPreferencesBackend.java
index 8a5386c3..55da8d48 100644
--- a/altosuilib/AltosUIPreferencesBackend.java
+++ b/altosuilib/AltosUIPreferencesBackend.java
@@ -19,7 +19,7 @@ package org.altusmetrum.altosuilib_1;
 
 import java.io.File;
 import java.util.prefs.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 import javax.swing.filechooser.FileSystemView;
 
 public class AltosUIPreferencesBackend implements AltosPreferencesBackend {
diff --git a/altosuilib/AltosUISeries.java b/altosuilib/AltosUISeries.java
index ac09a3cc..441eba2b 100644
--- a/altosuilib/AltosUISeries.java
+++ b/altosuilib/AltosUISeries.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -34,6 +34,24 @@ import org.jfree.chart.labels.*;
 import org.jfree.data.xy.*;
 import org.jfree.data.*;
 
+class AltosUITime extends AltosUnits {
+	public double value(double v, boolean imperial_units) { return v; }
+
+	public double inverse(double v, boolean imperial_unis) { return v; }
+	
+	public String show_units(boolean imperial_units) { return "s"; }
+
+	public String say_units(boolean imperial_units) { return "seconds"; }
+
+	public int show_fraction(int width, boolean imperial_units) {
+		if (width < 5)
+			return 0;
+		return width - 5;
+	}
+
+	public int say_fraction(boolean imperial_units) { return 0; }
+}
+
 public class AltosUISeries extends XYSeries implements AltosUIGrapher {
 	AltosUIAxis	axis;
 	String		label;
@@ -47,11 +65,12 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher {
 		axis.set_units();
 		StandardXYToolTipGenerator	ttg;
 
-		String  example = units.graph_format(4);
+		String	time_example = (new AltosUITime()).graph_format(7);
+		String  example = units.graph_format(7);
 
 		ttg = new StandardXYToolTipGenerator(String.format("{1}s: {2}%s ({0})",
 								   units.show_units()),
-						     new java.text.DecimalFormat(example),
+						     new java.text.DecimalFormat(time_example),
 						     new java.text.DecimalFormat(example));
 		renderer.setBaseToolTipGenerator(ttg);
 	}
diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index a06b6869..4f329840 100644
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -68,18 +68,20 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 		if (want_product == AltosUILib.product_any)
 			return true;
 
+		int have_product = getProduct();
+
 		if (want_product == AltosUILib.product_basestation)
-			return matchProduct(AltosUILib.product_teledongle) ||
-				matchProduct(AltosUILib.product_teleterra) ||
-				matchProduct(AltosUILib.product_telebt) ||
-				matchProduct(AltosUILib.product_megadongle);
+			return have_product == AltosUILib.product_teledongle ||
+				have_product == AltosUILib.product_teleterra ||
+				have_product == AltosUILib.product_telebt ||
+				have_product == AltosUILib.product_megadongle;
 
 		if (want_product == AltosUILib.product_altimeter)
-			return matchProduct(AltosUILib.product_telemetrum) ||
-				matchProduct(AltosUILib.product_telemega) ||
-				matchProduct(AltosUILib.product_telegps);
-
-		int have_product = getProduct();
+			return have_product == AltosUILib.product_telemetrum ||
+				have_product == AltosUILib.product_telemega ||
+				have_product == AltosUILib.product_telegps ||
+				have_product == AltosUILib.product_easymini ||
+				have_product == AltosUILib.product_telemini;
 
 		if (have_product == AltosUILib.product_altusmetrum)	/* old devices match any request */
 			return true;
diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index 0cd2aaea..4b22af1f 100644
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -1,4 +1,4 @@
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
 
 JAVAROOT=bin