projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools: Add lots of compiler warning flags to ao-tools build
[fw/altos]
/
altosuilib
/
AltosUIMapPreload.java
diff --git
a/altosuilib/AltosUIMapPreload.java
b/altosuilib/AltosUIMapPreload.java
index 06c4c59bcf406590f3edf18b5d59d0a230144565..ffd974acd16855aaa6f8386b70a25a81aae596a7 100644
(file)
--- a/
altosuilib/AltosUIMapPreload.java
+++ b/
altosuilib/AltosUIMapPreload.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.*;
@@
-27,7
+27,7
@@
import java.text.*;
import java.lang.Math;
import java.net.URL;
import java.net.URLConnection;
import java.lang.Math;
import java.net.URL;
import java.net.URLConnection;
-import org.altusmetrum.altoslib_1
1
.*;
+import org.altusmetrum.altoslib_1
3
.*;
class AltosUIMapPos extends Box implements ActionListener {
AltosUIMapPreload preload;
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;
JToggleButton load_button;
JButton close_button;
+/*
JCheckBox[] maptypes = new JCheckBox[AltosMap.maptype_terrain - AltosMap.maptype_hybrid + 1];
JCheckBox[] maptypes = new JCheckBox[AltosMap.maptype_terrain - AltosMap.maptype_hybrid + 1];
+*/
JComboBox<Integer> min_zoom;
JComboBox<Integer> max_zoom;
JComboBox<Integer> min_zoom;
JComboBox<Integer> max_zoom;
@@
-215,11
+217,14
@@
public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
private int all_types() {
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;
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) {
}
void center_map(double latitude, double longitude) {
@@
-485,6
+490,7
@@
public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
pane.add(close_button, c);
pane.add(close_button, c);
+/*
JLabel types_label = new JLabel("Map Types");
c.gridx = 2;
c.gridwidth = 2;
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);
}
c.gridy = (type & 1) + 3;
pane.add(maptypes[type], c);
}
+*/
JLabel min_zoom_label = new JLabel("Minimum Zoom");
c.gridx = 4;
JLabel min_zoom_label = new JLabel("Minimum Zoom");
c.gridx = 4;