Changeset 56

Timestamp:

08/08/07 02:42:05 (6 years ago)

Author:

saua

Message:

• add timer in BBTracker for each component to use
• add more startup actions

Location:

bbtracker/trunk/src/org/bbtracker/mobile

Files:

• BBTracker.java (modified) (10 diffs)
• Preferences.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package org.bbtracker.mobile;
+
+import java.util.Timer;
 
 import javax.microedition.lcdui.Alert;
@@ -15 +17 @@
 import org.bbtracker.mobile.gui.MainCanvas;
 import org.bbtracker.mobile.gui.NewTrackForm;
+import org.bbtracker.mobile.gui.TracksForm;
 
 public class BBTracker extends MIDlet {
@@ -29 +32 @@
         private final MainCanvas mainCanvas;
 
+        private final Timer timer;
+
         private boolean firstStart = true;
 
@@ -37 +42 @@
                 fullname = NAME + " " + version;
 
+                timer = new Timer();
+
                 trackManager = new TrackManager();
 
                 mainCanvas = new MainCanvas(trackManager);
+
+                TrackStore.getInstance();
 
                 try {
@@ -47 +56 @@
                                 trackManager.initLocationProvider();
                                 break;
-                        case Preferences.START_ACTION_NOTHING:
+                        default:
                                 break;
                         }
@@ -69 +78 @@
         }
 
-        protected void destroyApp(final boolean force) throws MIDletStateChangeException {
-                shutdown(true);
-        }
-
-        protected void pauseApp() {
-        }
-
-        protected void startApp() throws MIDletStateChangeException {
-                if (firstStart) {
-                        if (Preferences.getInstance().getStartAction() == Preferences.START_ACTION_NEWTRACK) {
-                                Display.getDisplay(this).setCurrent(new NewTrackForm(trackManager));
-                        } else {
-                                showMainCanvas();
-                        }
-                        firstStart = false;
-                } else {
-                        showMainCanvas();
-                }
-
-        }
-
-        public static Display getDisplay() {
-                return Display.getDisplay(instance);
-        }
-
         public static String getFullName() {
                 return fullname;
-        }
-
-        public static BBTracker getInstance() {
-                return instance;
         }
 
@@ -110 +90 @@
         }
 
+        public static BBTracker getInstance() {
+                return instance;
+        }
+
+        public static Display getDisplay() {
+                return Display.getDisplay(instance);
+        }
+
+        public static Timer getTimer() {
+                return instance.timer;
+        }
+
         public static void nonFatal(final Throwable t, final String action, final Displayable next) {
                 log(t);
@@ -115 +107 @@
                                 t.getMessage(), null, AlertType.WARNING);
                 alert(alert, next);
-        }
-
-        public static void alert(final Alert alert, final Displayable next) {
-                getDisplay().setCurrent(alert, next != null ? next : getInstance().mainCanvas);
         }
 
@@ -138 +126 @@
         }
 
+        public static void alert(final Alert alert, final Displayable next) {
+                getDisplay().setCurrent(alert, next != null ? next : getInstance().mainCanvas);
+        }
+
         public void showMainCanvas() {
                 getDisplay().setCurrent(mainCanvas);
@@ -143 +135 @@
 
         public static void log(final Throwable e) {
-                // used only for debugging
+                log(e.toString());
                 e.printStackTrace();
         }
 
         public static void log(final String m) {
-                // used only for debugging
                 System.err.println(m);
         }
+
+        protected void destroyApp(final boolean force) throws MIDletStateChangeException {
+                shutdown(true);
+        }
+
+        protected void pauseApp() {
+        }
+
+        protected void startApp() throws MIDletStateChangeException {
+                if (firstStart) {
+                        firstStart = false;
+                        final int startAction = Preferences.getInstance().getStartAction();
+                        if (startAction == Preferences.START_ACTION_NEWTRACK) {
+                                Display.getDisplay(this).setCurrent(new NewTrackForm(trackManager));
+                        } else if (startAction == Preferences.START_ACTION_TRACKS_SCREEN) {
+                                try {
+                                        Display.getDisplay(this).setCurrent(new TracksForm(trackManager));
+                                } catch (final RecordStoreException e) {
+                                        nonFatal(e, "Opening Track Screen", mainCanvas);
+                                }
+                        } else {
+                                showMainCanvas();
+                        }
+                } else {
+                        showMainCanvas();
+                }
+        }
 }

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

@@ -26 +26 @@
         public static final int START_ACTION_NEWTRACK = 2;
 
-        public static String[] START_ACTIONS = new String[] { "Do nothing", "Initialize GPS", "Start new track" };
+        public static final int START_ACTION_TRACKS_SCREEN = 3;
+
+        public static String[] START_ACTIONS = new String[] { "Do nothing", "Initialize GPS", "Start new track",
+                        "Open Track Screen" };
 
         public static final int EXPORT_KML = 0;
 
-        public static final int EXPORT_GPx = 1;
+        public static final int EXPORT_GPX = 1;
 
         public static String[] EXPORT_FORMATS = new String[] { "KML (Google Earth)", "GPX" };
@@ -94 +97 @@
 
         public void setExportDirectory(final String exportDirectory) {
-                this.exportDirectory = exportDirectory;
+                if (exportDirectory == null || exportDirectory.length() == 0) {
+                        this.exportDirectory = null;
+                } else {
+                        this.exportDirectory = exportDirectory;
+                }
         }
 
@@ -170 +177 @@
                         if (in.readByte() != 0) {
                                 exportDirectory = in.readUTF();
+                        } else {
+                                exportDirectory = null;
                         }
                         exportFormats = in.readInt();