X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIConfigure.java;h=75957b33ba6c51f08731337e2a72f24127f76710;hp=6c9a841e9a294e1eec33a1c64d37ac67385a5a64;hb=f822b84d8c25159ff113fef6a419b6e18e87a87a;hpb=670034eef48d63cdaec8d271fa93da984ffe2ea9

diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java
index 6c9a841e..75957b33 100644
--- a/altosuilib/AltosUIConfigure.java
+++ b/altosuilib/AltosUIConfigure.java
@@ -15,18 +15,19 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib;
+package org.altusmetrum.altosuilib_7;
 
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;
+import org.altusmetrum.altoslib_7.*;
 
-class DelegatingRenderer implements ListCellRenderer {
+class DelegatingRenderer implements ListCellRenderer<Object> {
 
 	// ...
-	public static void install(JComboBox comboBox) {
+	public static void install(JComboBox<Object> comboBox) {
 		DelegatingRenderer renderer = new DelegatingRenderer(comboBox);
 		renderer.initialise();
 		comboBox.setRenderer(renderer);
@@ -36,7 +37,7 @@ class DelegatingRenderer implements ListCellRenderer {
 	private final JComboBox comboBox;
 
 	// ...
-	private ListCellRenderer delegate;
+	private ListCellRenderer<? super Object> delegate;
 
 	// ...
 	private DelegatingRenderer(JComboBox comboBox) {
@@ -45,21 +46,22 @@ class DelegatingRenderer implements ListCellRenderer {
 
 	// ...
 	private void initialise() {
-		delegate = new JComboBox().getRenderer();
+		JComboBox<Object> c = new JComboBox<Object>();
+		delegate = c.getRenderer();
 		comboBox.addPropertyChangeListener("UI", new PropertyChangeListener() {
 
 				public void propertyChange(PropertyChangeEvent evt) {
-					delegate = new JComboBox().getRenderer();
+					delegate = new JComboBox<Object>().getRenderer();
 				}
 			});
 	}
 
 	// ...
-	public Component getListCellRendererComponent(JList list,
+	public Component getListCellRendererComponent(JList<?> list,
 						      Object value, int index, boolean isSelected, boolean cellHasFocus) {
 
 		return delegate.getListCellRendererComponent(list,
-							     ((UIManager.LookAndFeelInfo) value).getName(),
+							     ((UIManager.LookAndFeelInfo)value).getName(),
 							     index, isSelected, cellHasFocus);
 	}
 }
@@ -139,7 +141,7 @@ public class AltosUIConfigure
 		/* Font size setting */
 		pane.add(new JLabel("Font size"), constraints(0, 1));
 
-		final JComboBox font_size_value = new JComboBox(font_size_names);
+		final JComboBox<String> font_size_value = new JComboBox<String>(font_size_names);
 		int font_size = AltosUIPreferences.font_size();
 		font_size_value.setSelectedIndex(font_size - AltosUILib.font_size_small);
 		font_size_value.addActionListener(new ActionListener() {
@@ -181,7 +183,7 @@ public class AltosUIConfigure
 
 		final UIManager.LookAndFeelInfo[] look_and_feels = UIManager.getInstalledLookAndFeels();
 
-		final JComboBox look_and_feel_value = new JComboBox(look_and_feels);
+		final JComboBox<Object> look_and_feel_value = new JComboBox<Object>(look_and_feels);
 
 		DelegatingRenderer.install(look_and_feel_value);
 
@@ -202,9 +204,10 @@ public class AltosUIConfigure
 		row++;
 	}
 
-	public void add_serial_debug() {
-		GridBagConstraints c = new GridBagConstraints();
+	public void add_position () {
+	}
 
+	public void add_serial_debug() {
 		/* Serial debug setting */
 		pane.add(new JLabel("Serial Debug"), constraints(0, 1));
 
@@ -217,12 +220,33 @@ public class AltosUIConfigure
 				}
 			});
 		serial_debug.setToolTipText("Enable/Disable USB I/O getting sent to the console");
-		c.gridx = 1;
-		c.gridy = row++;
-		c.gridwidth = 3;
-		c.fill = GridBagConstraints.NONE;
-		c.anchor = GridBagConstraints.WEST;
-		pane.add(serial_debug, c);
+		pane.add(serial_debug, constraints(1,2));
+		row++;
+	}
+
+	static final Integer map_caches[] = { 9, 25, 100 };
+
+	public void add_map_cache() {
+		pane.add(new JLabel("Map Cache Size"), constraints(0, 1));
+
+		final JComboBox<Integer> map_cache = new JComboBox<Integer>(map_caches);
+
+		map_cache.setEditable(true);
+		map_cache.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					try {
+						int	size = (Integer) (map_cache.getSelectedItem());
+
+						AltosUIPreferences.set_map_cache(size);
+					} catch (ClassCastException ce) {
+						map_cache.setSelectedItem(new Integer(AltosUIPreferences.map_cache()));
+					}
+				}
+			});
+
+		map_cache.setSelectedItem (new Integer(AltosUIPreferences.map_cache()));
+		pane.add(map_cache, constraints(1, 2, GridBagConstraints.BOTH));
+		row++;
 	}
 
 	public void add_bluetooth() {
@@ -231,8 +255,8 @@ public class AltosUIConfigure
 	public void add_frequencies() {
 	}
 
-	public AltosUIConfigure(JFrame in_owner) {
-		super(in_owner, "Configure AltosUI", false);
+	public AltosUIConfigure(JFrame in_owner, String name, String label) {
+		super(in_owner, name, false);
 
 		owner = in_owner;
 		pane = getContentPane();
@@ -241,11 +265,13 @@ public class AltosUIConfigure
 		row = 0;
 
 		/* Nice label at the top */
-		pane.add(new JLabel ("Configure AltOS UI"),
+		pane.add(new JLabel (label),
 			 constraints(0, 3));
 		row++;
 
-		pane.add(new JLabel (String.format("AltOS version %s", AltosUIVersion.version)),
+		pane.add(new JLabel (String.format("AltOS version %s (%smaps key)",
+						   AltosVersion.version,
+						   AltosVersion.has_google_maps_api_key() ? "" : "no ")),
 			 constraints(0, 3));
 		row++;
 
@@ -253,9 +279,13 @@ public class AltosUIConfigure
 		add_log_dir();
 		add_callsign();
 		add_units();
+		add_serial_debug();
 		add_font_size();
 		add_look_and_feel();
-		add_bluetooth();
+		add_position();
+		add_map_cache();
+		if (AltosUILib.has_bluetooth)
+			add_bluetooth();
 		add_frequencies();
 
 		/* And a close button at the bottom */
@@ -271,4 +301,8 @@ public class AltosUIConfigure
 		setLocationRelativeTo(owner);
 		setVisible(true);
 	}
+
+	public AltosUIConfigure(JFrame in_owner) {
+		this(in_owner, "Configure AltosUI", "Configure AltOS UI");
+	}
 }