From: jihye kim <jihye1128.kim@samsung.com>
Date: Sun, 22 Apr 2012 15:25:49 +0000 (+0900)
Subject: [Title] delete empty and unknown tag types
X-Git-Tag: 2.2.1_release^2~113^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76443975791f7805d033717776e906badd5fa45b;p=sdk%2Femulator%2Feventinjector-eplugin.git

[Title] delete empty and unknown tag types
[Type] work
[Module] event injector
[Priority] major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
---

diff --git a/org.tizen.nfc/src/org/tizen/nfc/page/NfcPage.java b/org.tizen.nfc/src/org/tizen/nfc/page/NfcPage.java
index 5a71948..12992a0 100644
--- a/org.tizen.nfc/src/org/tizen/nfc/page/NfcPage.java
+++ b/org.tizen.nfc/src/org/tizen/nfc/page/NfcPage.java
@@ -195,7 +195,7 @@ public class NfcPage extends AbstractInjectorPage implements ISelectionListener
 			private void Selected(SelectionEvent e) {
 				int i = cmbRecordFormat.getSelectionIndex();
 				if (i != -1) {
-					checkRecordFormat(i);
+					checkRecordFormat(i + 1);
 					txtRecordTypeName.setText("");
 					cmbRecordTypeName.select(0);
 					txtRecordID.setText("");
@@ -365,7 +365,7 @@ public class NfcPage extends AbstractInjectorPage implements ISelectionListener
 		if (i != -1) {
 			NDEFRecord record = RecordList.get(i);
 			checkRecordFormat(record.getFormat());
-			cmbRecordFormat.select(record.getFormat());
+			cmbRecordFormat.select(record.getFormat() - 1);
 
 			if (record.getFormat() == 1) {
 				if (record.getTypeName().compareTo("U") == 0)
@@ -439,7 +439,7 @@ public class NfcPage extends AbstractInjectorPage implements ISelectionListener
 			{
 				cmbRecordFormat.setEnabled(true);
 
-				checkRecordFormat(cmbRecordFormat.getSelectionIndex());
+				checkRecordFormat(cmbRecordFormat.getSelectionIndex() + 1);
 				txtRecordTypeName.setText("");
 				cmbRecordTypeName.select(0);
 				txtRecordID.setText("");
@@ -485,7 +485,7 @@ public class NfcPage extends AbstractInjectorPage implements ISelectionListener
 			{
 				cmbRecordFormat.setEnabled(true);
 
-				checkRecordFormat(cmbRecordFormat.getSelectionIndex());
+				checkRecordFormat(cmbRecordFormat.getSelectionIndex() + 1);
 				txtRecordTypeName.setText("");
 				cmbRecordTypeName.select(0);
 				txtRecordID.setText("");
@@ -661,9 +661,9 @@ public class NfcPage extends AbstractInjectorPage implements ISelectionListener
 
 	private void setRecordValue(NDEFRecord record)
 	{
-		record.setFormat(cmbRecordFormat.getSelectionIndex());
+		record.setFormat(cmbRecordFormat.getSelectionIndex() + 1);
 
-		if (cmbRecordFormat.getSelectionIndex() == 1) {
+		if ((cmbRecordFormat.getSelectionIndex() + 1) == 1) {
 			record.setTypeName(TypeNameList[cmbRecordTypeName.getSelectionIndex()]);
 		} else {
 			if (txtRecordTypeName.getText().isEmpty() == true)
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 2272fbf..2c93807 100644
--- a/org.tizen.nfc/src/org/tizen/nfc/page/NfcStringResource.java
+++ b/org.tizen.nfc/src/org/tizen/nfc/page/NfcStringResource.java
@@ -82,12 +82,12 @@ class RecordFormat extends NfcStringResource
 
 	private RecordFormat()
 	{
-		add(0, "NDEF_TNF_EMPTY");
-		add(1, "NDEF_TNF_WELL_KNOWN");
-		add(2, "NDEF_TNF_MIME_MEDIA");
-		add(3, "NDEF_TNF_ABSOLUTE_URI");
-		add(4, "NDEF_TNF_EXTERNAL");
-		add(5, "NDEF_TNF_UNKNOWN");
+		//add(0, "NDEF_TNF_EMPTY");
+		add(0, "NDEF_TNF_WELL_KNOWN");
+		add(1, "NDEF_TNF_MIME_MEDIA");
+		add(2, "NDEF_TNF_ABSOLUTE_URI");
+		add(3, "NDEF_TNF_EXTERNAL");
+		//add(5, "NDEF_TNF_UNKNOWN");
 	}
 }
 
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 478aa7a..4841744 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Package:eventinjector-eplugin
-Version:0.2.18
+Version:0.2.19
 OS:linux
 Build-host-os:linux
 Maintainer:yeongkyoon Lee <yeongkyoon.lee@samsung.com>, sungmin Ha <sungmin82.ha@samsung.com>
@@ -9,7 +9,7 @@ Install-dependency:common-eplugin[linux], base-ide-product[linux]
 Source:eventinjector-eplugin
 
 Package:eventinjector-eplugin
-Version:0.2.18
+Version:0.2.19
 OS:windows
 Build-host-os:linux
 Maintainer:yeongkyoon Lee <yeongkyoon.lee@samsung.com>, sungmin Ha <sungmin82.ha@samsung.com>