Changeset 201 for bbtracker/trunk/src/org/bbtracker/mobile/gui/MainCanvas.java

Timestamp:

05/07/08 13:25:49 (4 years ago)

Author:

saua

Message:

Fix #83, #84 and #85: general buggyness of marking trackpoints

File:

• bbtracker/trunk/src/org/bbtracker/mobile/gui/MainCanvas.java (modified) (2 diffs)

bbtracker/trunk/src/org/bbtracker/mobile/gui/MainCanvas.java

@@ -419 +419 @@
                         BBTracker.alert(new Alert("Can not mark point", errorMessage, null, AlertType.INFO), this);
                 } else {
+                        final String oldName = p.getName();
                         final Form f = new Form("Mark Point");
-                        final TextField textField = new TextField("Note: ", "", 30, TextField.ANY);
+                        final TextField textField = new TextField("Note: ", oldName != null ? oldName : "", 30, TextField.ANY);
                         f.append(textField);
-                        f.append(new StringItem("Point: ", pi + "/" + manager.getTrack().getPointCount()));
+                        f.append(new StringItem("Point: ", (pi + 1) + "/" + manager.getTrack().getPointCount()));
                         f.append(new StringItem("Longitude: ", Utils.longitudeToString(p.getLongitude())));
                         f.append(new StringItem("Latitude: ", Utils.latitudeToString(p.getLatitude())));
@@ -432 +433 @@
                                         if (cmd == GuiUtils.OK_COMMAND) {
                                                 final String s = textField.getString();
-                                                p.setName(s.length() == 0 ? "X" : s);
+                                                final String newName;
+                                                if ("".equals(s)) {
+                                                        if (oldName == null) {
+                                                                newName = "X";
+                                                        } else {
+                                                                newName = null;
+                                                        }
+                                                } else {
+                                                        newName = s;
+                                                }
+                                                p.setName(newName);
                                         }
                                         BBTracker.getDisplay().setCurrent(MainCanvas.this);