projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosuilib
/
AltosUIConfigure.java
diff --git
a/altosuilib/AltosUIConfigure.java
b/altosuilib/AltosUIConfigure.java
index 6ca8c777137926e7dae9d3f87f3a0ea1ab1a0619..09e7daaab595f73cb257e85921f4f32a2e841d81 100644
(file)
--- a/
altosuilib/AltosUIConfigure.java
+++ b/
altosuilib/AltosUIConfigure.java
@@
-16,14
+16,14
@@
* 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
2
;
+package org.altusmetrum.altosuilib_1
4
;
import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import javax.swing.*;
import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import javax.swing.*;
import javax.swing.event.*;
-import org.altusmetrum.altoslib_1
2
.*;
+import org.altusmetrum.altoslib_1
4
.*;
class DelegatingRenderer implements ListCellRenderer<Object> {
class DelegatingRenderer implements ListCellRenderer<Object> {
@@
-240,12
+240,12
@@
public class AltosUIConfigure
AltosUIPreferences.set_map_cache(size);
} catch (ClassCastException ce) {
AltosUIPreferences.set_map_cache(size);
} catch (ClassCastException ce) {
- map_cache.setSelectedItem(
new Integer(AltosUIPreferences.map_cache()
));
+ map_cache.setSelectedItem(
AltosUIPreferences.map_cache(
));
}
}
});
}
}
});
- map_cache.setSelectedItem (
new Integer(AltosUIPreferences.map_cache()
));
+ map_cache.setSelectedItem (
AltosUIPreferences.map_cache(
));
pane.add(map_cache, constraints(1, 2, GridBagConstraints.BOTH));
row++;
}
pane.add(map_cache, constraints(1, 2, GridBagConstraints.BOTH));
row++;
}
@@
-260,7
+260,7
@@
public class AltosUIConfigure
super(in_owner, name, false);
owner = in_owner;
super(in_owner, name, false);
owner = in_owner;
- pane = get
Content
Pane();
+ pane = get
Scrollable
Pane();
pane.setLayout(new GridBagLayout());
row = 0;
pane.setLayout(new GridBagLayout());
row = 0;
@@
-270,9
+270,8
@@
public class AltosUIConfigure
constraints(0, 3));
row++;
constraints(0, 3));
row++;
- pane.add(new JLabel (String.format("AltOS version %s (%smaps key)",
- AltosVersion.version,
- AltosVersion.has_google_maps_api_key() ? "" : "no ")),
+ pane.add(new JLabel (String.format("AltOS version %s",
+ AltosVersion.version)),
constraints(0, 3));
row++;
constraints(0, 3));
row++;