altosuilib: Get rid of AltosUIVersion.java

[fw/altos] / altosuilib / AltosUIConfigure.java

diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java
index 5648d1dfd5f78811c0b9981e3f5437e258133fc1..75957b33ba6c51f08731337e2a72f24127f76710 100644 (file)
--- a/altosuilib/AltosUIConfigure.java
+++ b/altosuilib/AltosUIConfigure.java
@@ -15,13 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_3;
+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<Object> {
 
@@ -269,8 +270,8 @@ public class AltosUIConfigure
                row++;
 
                pane.add(new JLabel (String.format("AltOS version %s (%smaps key)",
-                                                  AltosUIVersion.version,
-                                                  AltosUIVersion.has_google_maps_api_key() ? "" : "no ")),
+                                                  AltosVersion.version,
+                                                  AltosVersion.has_google_maps_api_key() ? "" : "no ")),
                         constraints(0, 3));
                row++;
 
@@ -283,7 +284,8 @@ public class AltosUIConfigure
                add_look_and_feel();
                add_position();
                add_map_cache();
-               add_bluetooth();
+               if (AltosUILib.has_bluetooth)
+                       add_bluetooth();
                add_frequencies();
 
                /* And a close button at the bottom */