Changeset 209

Timestamp:

05/08/08 14:21:02 (5 years ago)

Author:

saua

Message:

update BBTracker to correct order of track stores

File:

• bbtracker/trunk/src/org/bbtracker/mobile/BBTracker.java (modified) (4 diffs)

bbtracker/trunk/src/org/bbtracker/mobile/BBTracker.java

@@ -19 +19 @@
 
 import java.util.Timer;
+import java.util.Vector;
 
 import javax.microedition.lcdui.Alert;
@@ -59 +60 @@
         private static boolean bluetoothAvailable = false;
 
+        // #ifndef AVOID_FILE_API
         private static boolean fileUrlAvailable = false;
+
+        // #endif
 
         private final TrackManager trackManager;
@@ -162 +166 @@
         }
 
+        // #ifndef AVOID_FILE_API
         public static boolean isFileUrlAvailable() {
                 return fileUrlAvailable;
         }
+
+        // #endif
 
         protected void destroyApp(final boolean force) throws MIDletStateChangeException {
@@ -227 +234 @@
                         fileUrlAvailable = (fileConnectionVersion != null);
                         addAPI("File", fileUrlAvailable);
-                        // #else
-// @ fileUrlAvailable = false;
                         // #endif
 
-                        final TrackStore[] trackStores = new TrackStore[fileUrlAvailable ? 2 : 1];
-                        trackStores[0] = new RMSTrackStore();
+                        final Vector stores = new Vector();
                         // #ifndef AVOID_FILE_API
                         if (fileUrlAvailable) {
-                                trackStores[1] = new FileTrackStore();
+                                stores.addElement(new FileTrackStore());
                         }
                         // #endif
+                        stores.addElement(new RMSTrackStore());
+                        final TrackStore[] trackStores = new TrackStore[stores.size()];
+                        stores.copyInto(trackStores);
                         final LocationProvider locationProvider;