projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: InputEvent.getModifiers is deprecated, use getModifiersEx
[fw/altos]
/
altosuilib
/
AltosUIMap.java
diff --git
a/altosuilib/AltosUIMap.java
b/altosuilib/AltosUIMap.java
index 05c99a126fc3776ec05efbc99767b5d3bd2761bc..7b9459a128068adabce4501d2c84ee06573df983 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
1
;
+package org.altusmetrum.altosuilib_1
3
;
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
1
.*;
+import org.altusmetrum.altoslib_1
3
.*;
public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosMapInterface {
public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosMapInterface {
@@
-106,7
+106,7
@@
public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
}
private boolean is_drag_event(MouseEvent e) {
}
private boolean is_drag_event(MouseEvent e) {
- return e.getModifiers
() == InputEvent.BUTTON1
_MASK;
+ return e.getModifiers
Ex() == InputEvent.BUTTON1_DOWN
_MASK;
}
/* MouseMotionListener methods */
}
/* MouseMotionListener methods */
@@
-278,10
+278,10
@@
public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
message = "Internal error";
break;
case AltosMapTile.failed:
message = "Internal error";
break;
case AltosMapTile.failed:
- message = "Network error
, check connection
";
+ message = "Network error";
break;
case AltosMapTile.forbidden:
break;
case AltosMapTile.forbidden:
- message = "
Too many requests, try later
";
+ message = "
Outside of launch area
";
break;
}
if (message != null && tile_font != null) {
break;
}
if (message != null && tile_font != null) {
@@
-386,8
+386,10
@@
public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
JLabel zoom_label;
public void set_maptype(int type) {
JLabel zoom_label;
public void set_maptype(int type) {
+/*
map.set_maptype(type);
maptype_combo.setSelectedIndex(type);
map.set_maptype(type);
maptype_combo.setSelectedIndex(type);
+*/
}
/* AltosUIMapPreload functions */
}
/* AltosUIMapPreload functions */
@@
-433,7
+435,9
@@
public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
/* internal layout bits */
private GridBagLayout layout = new GridBagLayout();
/* internal layout bits */
private GridBagLayout layout = new GridBagLayout();
+/*
JComboBox<String> maptype_combo;
JComboBox<String> maptype_combo;
+*/
MapView view;
MapView view;
@@
-522,6
+526,7
@@
public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
c.weighty = 0;
add(zoom_out, c);
c.weighty = 0;
add(zoom_out, c);
+/*
maptype_combo = new JComboBox<String>(map.maptype_labels);
maptype_combo.setEditable(false);
maptype_combo = new JComboBox<String>(map.maptype_labels);
maptype_combo.setEditable(false);
@@
-540,7
+545,7
@@
public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
c.weightx = 0;
c.weighty = 0;
add(maptype_combo, c);
c.weightx = 0;
c.weighty = 0;
add(maptype_combo, c);
-
+*/
map = new AltosMap(this);
}
}
map = new AltosMap(this);
}
}