diff options
| author | Bdale Garbee <bdale@gag.com> | 2018-10-08 17:52:22 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2018-10-08 17:52:22 -0600 |
| commit | 2450e69d3afd3345a6e5f7ca133d929fbdcfdf53 (patch) | |
| tree | c04aa34bdecbf909dbeea8854390364bf140e7ca /altosuilib/AltosUIMapPreload.java | |
| parent | 449ed72371f80f03dcc5dcf66af5c9465e7ed57e (diff) | |
| parent | 5a86ff43a2b4a90dbddc1bba48019626e1b83e10 (diff) | |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'altosuilib/AltosUIMapPreload.java')
| -rw-r--r-- | altosuilib/AltosUIMapPreload.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/altosuilib/AltosUIMapPreload.java b/altosuilib/AltosUIMapPreload.java index 81cda0d2..ffd974ac 100644 --- a/altosuilib/AltosUIMapPreload.java +++ b/altosuilib/AltosUIMapPreload.java @@ -16,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altosuilib_12; +package org.altusmetrum.altosuilib_13; import java.awt.*; import java.awt.event.*; @@ -27,7 +27,7 @@ import java.text.*; import java.lang.Math; import java.net.URL; import java.net.URLConnection; -import org.altusmetrum.altoslib_12.*; +import org.altusmetrum.altoslib_13.*; class AltosUIMapPos extends Box implements ActionListener { AltosUIMapPreload preload; @@ -144,7 +144,9 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I JToggleButton load_button; JButton close_button; +/* JCheckBox[] maptypes = new JCheckBox[AltosMap.maptype_terrain - AltosMap.maptype_hybrid + 1]; +*/ JComboBox<Integer> min_zoom; JComboBox<Integer> max_zoom; @@ -215,11 +217,14 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I private int all_types() { +/* int all_types = 0; for (int t = AltosMap.maptype_hybrid; t <= AltosMap.maptype_terrain; t++) if (maptypes[t].isSelected()) all_types |= (1 << t); return all_types; +*/ + return 1 << AltosMap.maptype_hybrid; } void center_map(double latitude, double longitude) { @@ -485,6 +490,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I pane.add(close_button, c); +/* JLabel types_label = new JLabel("Map Types"); c.gridx = 2; c.gridwidth = 2; @@ -501,6 +507,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I c.gridy = (type & 1) + 3; pane.add(maptypes[type], c); } +*/ JLabel min_zoom_label = new JLabel("Minimum Zoom"); c.gridx = 4; |