From: Woowon Date: Mon, 22 Apr 2013 05:49:57 +0000 (+0900) Subject: merge the reviewed files X-Git-Tag: 2.1b_release~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=671f346d97dbbdf404b519832bcdc74af219d9c1;p=platform%2Fframework%2Fnative%2Fnfc.git merge the reviewed files Change-Id: Ia287535c9310096114ddb37c027f920bc617e16e Signed-off-by: Woowon --- diff --git a/inc/FNetNfcINdefPushManagerListener.h b/inc/FNetNfcINdefPushManagerListener.h index 91b3129..df9e1df 100644 --- a/inc/FNetNfcINdefPushManagerListener.h +++ b/inc/FNetNfcINdefPushManagerListener.h @@ -57,11 +57,11 @@ public: * * @since 2.0 * - * @param[in] r The result of pushed NDEF message @n - * The following exceptions may be given through this parameter. - * @exception E_SUCCESS The method is successful. - * @exception E_NOT_RESPONDING The device is not responding. - * @exception E_OPERATION_FAILED The operation has failed. + * @param[in] r The result of pushed NDEF message @n + * The following exceptions may be given through this parameter. + * @exception E_SUCCESS The method is successful. + * @exception E_NOT_RESPONDING The device is not responding. + * @exception E_OPERATION_FAILED The operation has failed. */ virtual void OnNdefPushMessageSent(result r) = 0; @@ -70,7 +70,7 @@ protected: // This method is for internal use only. Using this method can cause behavioral, security-related, and // consistency-related issues in the application. // - // The following methods are reserved, and the name of methods can be changed at any time without prior notice. + // This method is reserved and may change its name at any time without prior notice. // // @since 2.0 // @@ -80,7 +80,7 @@ protected: // This method is for internal use only. Using this method can cause behavioral, security-related, and // consistency-related issues in the application. // - // The following methods are reserved, and the name of methods can be changed at any time without prior notice. + // This method is reserved and may change its name at any time without prior notice. // // @since 2.0 // diff --git a/inc/FNetNfcINfcDeviceDiscoveryEventListener.h b/inc/FNetNfcINfcDeviceDiscoveryEventListener.h index b51ad43..178fba6 100644 --- a/inc/FNetNfcINfcDeviceDiscoveryEventListener.h +++ b/inc/FNetNfcINfcDeviceDiscoveryEventListener.h @@ -72,7 +72,7 @@ protected: // This method is for internal use only. Using this method can cause behavioral, security-related, // and consistency-related issues in the application. // - // The following methods are reserved, and the name of methods can be changed at any time without prior notice. + // This method is reserved and may change its name at any time without prior notice. // // @since 2.0 // @@ -82,7 +82,7 @@ protected: // This method is for internal use only. Using this method can cause behavioral, security-related, // and consistency-related issues in the application. // - // The following methods are reserved, and the name of methods can be changed at any time without prior notice. + // This method is reserved and may change its name at any time without prior notice. // // @since 2.0 // diff --git a/inc/FNetNfcNdefMessage.h b/inc/FNetNfcNdefMessage.h index 953c46e..75b4743 100644 --- a/inc/FNetNfcNdefMessage.h +++ b/inc/FNetNfcNdefMessage.h @@ -279,7 +279,7 @@ public: static NdefMessage* GetInstanceN(const Tizen::Base::ByteBuffer& buffer); /** - * Assigns the value of the specified instance to the current instance of %NdefMessage. + * Assigns the value of a specified instance to the current instance of %NdefMessage. * * @since 2.0 * diff --git a/inc/FNetNfcNdefPushManager.h b/inc/FNetNfcNdefPushManager.h index cc88818..8a8f8e7 100755 --- a/inc/FNetNfcNdefPushManager.h +++ b/inc/FNetNfcNdefPushManager.h @@ -179,7 +179,7 @@ public: * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 * @remarks Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). */ result SetNdefPushManagerListener(INdefPushManagerListener* pListener); @@ -209,7 +209,7 @@ public: * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 * @remarks Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). */ result Push(const NdefMessage& message); @@ -237,7 +237,7 @@ public: * @see * The NFC Reserved Push guide * @remarks Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). */ result ActivateReservedPush(void); @@ -265,7 +265,7 @@ public: * @see * The NFC Reserved Push guide * @remarks Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). */ result DeactivateReservedPush(void); @@ -312,13 +312,14 @@ public: * Application Filtering. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. * @exception E_SYSTEM The method cannot proceed due to a severe system error. + * + * @remarks + * - The only one message can be selected to push. So the previously selected message will be replaced + * by the new one. + * - Before calling this method, check whether the feature is supported by + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). * @see * The NFC Reserved Push guide - * @remarks - * - The only one message can be selected to push. So the previously selected message will be replaced - * by the new one. - * - Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). */ result PickReservedPushMessage(const Tizen::App::PackageId& packageId); @@ -343,7 +344,7 @@ public: * @remarks * - The specific error code can be accessed using the GetLastResult() method. * - Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). */ Tizen::App::PackageId GetPickedReservedPushMessage(void) const; @@ -381,7 +382,7 @@ public: * - The registered NDEF message is pushed only if it is selected by the user through the Setting * application. * - Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). */ static result RegisterNdefPushMessage(const NdefMessage& message, const Tizen::Base::String& description); @@ -406,7 +407,7 @@ public: * @see * The NFC Reserved Push guide * @remarks Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). */ static result UnregisterNdefPushMessage(void); diff --git a/inc/FNetNfcNdefRecord.h b/inc/FNetNfcNdefRecord.h index 4367e05..67360bd 100644 --- a/inc/FNetNfcNdefRecord.h +++ b/inc/FNetNfcNdefRecord.h @@ -191,7 +191,7 @@ public: result SetPayload(const Tizen::Base::ByteBuffer& payload); /** - * Assigns the value of the specified instance to the current instance of %NdefRecord. + * Assigns the value of a specified instance to the current instance of %NdefRecord. * * @since 2.0 * diff --git a/inc/FNetNfcNdefRecordType.h b/inc/FNetNfcNdefRecordType.h index d1855cb..81f398b 100644 --- a/inc/FNetNfcNdefRecordType.h +++ b/inc/FNetNfcNdefRecordType.h @@ -43,8 +43,8 @@ class _NdefRecordTypeImpl; * Defines the NDEF RTD Smart Poster type. * * @brief [Deprecated] - * @deprecated This object is provided only for backward compatibility and will be deleted in the near future. - * Use @c NFC_NDEF_RTD_SMART_POSTER instead of this object. + * @deprecated This object is provided only for backward compatibility and will be deleted in the near future. + * Use @c NFC_NDEF_RTD_SMART_POSTER instead of this object. * @since 2.0 * @endif */ @@ -62,8 +62,8 @@ _OSP_EXPORT_ extern const wchar_t NFC_NDEF_RTD_SMART_POSTER[]; * Defines the NDEF RTD %Text type. * * @brief [Deprecated] - * @deprecated This object is provided only for backward compatibility and will be deleted in the near future. - * Use @c NFC_NDEF_RTD_TEXT instead of this object. + * @deprecated This object is provided only for backward compatibility and will be deleted in the near future. + * Use @c NFC_NDEF_RTD_TEXT instead of this object. * @since 2.0 * @endif */ @@ -81,8 +81,8 @@ _OSP_EXPORT_ extern const wchar_t NFC_NDEF_RTD_TEXT[]; * Defines the NDEF RTD URI type. * * @brief [Deprecated] - * @deprecated This object is provided only for backward compatibility and will be deleted in the near future. - * Use @c NFC_NDEF_RTD_URI instead of this object. + * @deprecated This object is provided only for backward compatibility and will be deleted in the near future. + * Use @c NFC_NDEF_RTD_URI instead of this object. * @since 2.0 * @endif */ @@ -179,7 +179,7 @@ public: * NDEF_TNF_ABSOLUTE_URI * The reserved characters must be percent encoded and the hexadecimal digits are normalized to upper-case * letters. The URI scheme and host parts of the URI must be normalized to lower case. After this, the URIs - * are compared character by character in a case-sensitive manner. + * are compared character by character in a case-sensitive manner. * * * NDEF_TNF_EXTERNAL diff --git a/inc/FNetNfcNfcManager.h b/inc/FNetNfcNfcManager.h index 31085d4..f5f6a6b 100755 --- a/inc/FNetNfcNfcManager.h +++ b/inc/FNetNfcNfcManager.h @@ -194,7 +194,7 @@ public: * @exception E_OUT_OF_MEMORY The memory is insufficient. * @exception E_SYSTEM A system error has occurred. * @remarks Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). */ result Construct(INfcManagerEventListener& listener); @@ -386,7 +386,7 @@ public: * @return An error code * @param[in] listener The listener to add * @exception E_SUCCESS The method is successful. - * @exception E_OBJ_ALREADY_EXIST The listener is already added. + * @exception E_OBJ_ALREADY_EXIST The listener has already been added. * @exception E_OUT_OF_MEMORY The memory is insufficient. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 @@ -451,7 +451,7 @@ public: * the input value immediately before the NdefMessage instance is deleted. * - The specific error code can be accessed using the GetLastResult() method. * - Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). * @see * The Conditional NFC App Launch guide * @see Tizen::App::AppManager::RegisterAppLaunch @@ -485,7 +485,7 @@ public: * is automatically enabled when the application goes to the background. The launch pop-up is * enabled by default. * - Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). * @see * The Conditional NFC App Launch guide */