projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump java lib versions in preparation for 1.9.2
[fw/altos]
/
altosuilib
/
AltosUIMap.java
diff --git
a/altosuilib/AltosUIMap.java
b/altosuilib/AltosUIMap.java
index 5b981d14e6113f2fa9d24c5a3616168295329c9d..5f1b7ae6f03429a4db89c39ad38763e59c6e05b6 100644
(file)
--- a/
altosuilib/AltosUIMap.java
+++ b/
altosuilib/AltosUIMap.java
@@
-16,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_1
3
;
+package org.altusmetrum.altosuilib_1
4
;
import java.awt.*;
import java.awt.event.*;
import java.awt.*;
import java.awt.event.*;
@@
-28,7
+28,7
@@
import java.awt.geom.*;
import java.util.*;
import java.util.concurrent.*;
import javax.imageio.*;
import java.util.*;
import java.util.concurrent.*;
import javax.imageio.*;
-import org.altusmetrum.altoslib_1
3
.*;
+import org.altusmetrum.altoslib_1
4
.*;
public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosMapInterface {
public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosMapInterface {
@@
-148,16
+148,16
@@
public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
public void mouseMoved(MouseEvent e) {
AltosMapPathPoint point = map.nearest(e.getPoint().x, e.getPoint().y);
public void mouseMoved(MouseEvent e) {
AltosMapPathPoint point = map.nearest(e.getPoint().x, e.getPoint().y);
- if (nearest_mark == null)
- nearest_mark = map.add_mark(point.gps.lat,
- point.gps.lon,
- point.state);
- else {
- nearest_mark.lat_lon.lat = point.gps.lat;
- nearest_mark.lat_lon.lon = point.gps.lon;
- nearest_mark.state = point.state;
- }
if (point != null) {
if (point != null) {
+ if (nearest_mark == null)
+ nearest_mark = map.add_mark(point.gps.lat,
+ point.gps.lon,
+ point.state);
+ else {
+ nearest_mark.lat_lon.lat = point.gps.lat;
+ nearest_mark.lat_lon.lon = point.gps.lon;
+ nearest_mark.state = point.state;
+ }
nearest_label.setText(String.format("%9.2f sec %s%s%s%s",
point.time,
pos(point.gps.lat,
nearest_label.setText(String.format("%9.2f sec %s%s%s%s",
point.time,
pos(point.gps.lat,