X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosScanUI.java;h=ef6389b6c94d966b502fa774f0f8d0615ecf3a63;hp=44eeda6dcc83ff228c21efe0415a1bf4f7de5bfa;hb=f164e48cbeff521d45737794e2046a08322951d6;hpb=a698cd68968fc0be5f96b1729cdea2f65d2ccbf6

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index 44eeda6d..ef6389b6 100644
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -59,29 +59,50 @@ class AltosScanResult {
 	}
 
 	public boolean equals(AltosScanResult other) {
-		return (callsign.equals(other.callsign) &&
-			serial == other.serial &&
-			flight == other.flight &&
+		return (serial == other.serial &&
 			frequency.frequency == other.frequency.frequency &&
 			telemetry == other.telemetry);
 	}
+
+	public boolean up_to_date(AltosScanResult other) {
+		if (flight == 0 && other.flight != 0) {
+			flight = other.flight;
+			return false;
+		}
+		if (callsign.equals("N0CALL") && !other.callsign.equals("N0CALL")) {
+			callsign = other.callsign;
+			return false;
+		}
+		return true;
+	}
 }
 
 class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel {
 	
 	LinkedList<ListDataListener>	listeners = new LinkedList<ListDataListener>();
 
+	void changed(ListDataEvent de) {
+		for (ListDataListener l : listeners)
+			l.contentsChanged(de);
+	}
+
 	public boolean add(AltosScanResult r) {
-		for (AltosScanResult old : this)
-			if (old.equals(r))
+		int i = 0;
+		for (AltosScanResult old : this) {
+			if (old.equals(r)) {
+				if (!old.up_to_date(r))
+					changed (new ListDataEvent(this,
+								   ListDataEvent.CONTENTS_CHANGED,
+								   i, i));
 				return true;
+			}
+			i++;
+		}
 
 		super.add(r);
-		ListDataEvent	de = new ListDataEvent(this,
-						       ListDataEvent.INTERVAL_ADDED,
-						       this.size() - 2, this.size() - 1);
-		for (ListDataListener l : listeners)
-			l.contentsChanged(de);
+		changed(new ListDataEvent(this,
+					  ListDataEvent.INTERVAL_ADDED,
+					  this.size() - 2, this.size() - 1));
 		return true;
 	}
 
@@ -205,6 +226,7 @@ public class AltosScanUI
 	
 	void set_frequency() throws InterruptedException, TimeoutException {
 		reader.set_frequency(frequencies[frequency_index].frequency);
+		reader.reset();
 	}
 	
 	void next() throws InterruptedException, TimeoutException {