From bf93693b028ca709edb3be0f24a8cf680b6e8321 Mon Sep 17 00:00:00 2001 From: jihye kim Date: Mon, 2 Jul 2012 15:36:15 +0900 Subject: [PATCH] [Title] modify function of reset markers (do not reload map only remove markers) [Type] Enhancement [Module] event injector [Priority] major [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- .../src/org/tizen/location/map/page/MapImage.java | 13 +++++++++---- org.tizen.nfc/src/org/tizen/nfc/page/NfcStringResource.java | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/org.tizen.location.map/src/org/tizen/location/map/page/MapImage.java b/org.tizen.location.map/src/org/tizen/location/map/page/MapImage.java index 1f4134f..7fe49da 100644 --- a/org.tizen.location.map/src/org/tizen/location/map/page/MapImage.java +++ b/org.tizen.location.map/src/org/tizen/location/map/page/MapImage.java @@ -388,15 +388,20 @@ public class MapImage extends AbstractInjectorPage { if (browser != null) { try { // Reload Google Map - browser.refresh(); - boolean bResult = browser.setText(googleMapScript); + boolean bResult = browser.execute("deleteMarkers()"); + DebugLog.log("[Map] Browser execute deleteMakers() : " + + (bResult ? "Success" : "Fail")); + + if (!bResult) { + bResult = browser.setText(googleMapScript); + DebugLog.log("[Map] Browser reload : " + + (bResult ? "Success" : "Fail")); + } model.clear(); ((Map) getParent()).refreshViewers(); injectButton.setEnabled(validate()); resetButton.setEnabled(validate()); - DebugLog.log("[Map] Browser reload : " - + (bResult ? "Success" : "Fail")); } catch (SWTException e) { e.printStackTrace(); } diff --git a/org.tizen.nfc/src/org/tizen/nfc/page/NfcStringResource.java b/org.tizen.nfc/src/org/tizen/nfc/page/NfcStringResource.java index a8d5831..2609750 100644 --- a/org.tizen.nfc/src/org/tizen/nfc/page/NfcStringResource.java +++ b/org.tizen.nfc/src/org/tizen/nfc/page/NfcStringResource.java @@ -31,7 +31,7 @@ import java.util.ArrayList; class NfcErrorString { public static String RecordCountIsZero = "NDEF record list is empty\nAt least one or more records are required."; public static String RecordCountIsMax = "The number of NDEF records has reached the maximum limit of 5.\n"; - + public static String MessageLenIsMax = "The length of the NDEF messag has reached the maximun limit of 4096 bytes.\n"; public static String MediaFileException = "Throw exception while select media file.\n"; public static String CheckVconfException = "Throw exception while check NFC state of emulator.\n"; -- 2.7.4