From: Pawel Kaczmarek <p.kaczmarek3@samsung.com>
Date: Wed, 28 Jan 2015 11:18:55 +0000 (+0100)
Subject: [Contact] JS code refactoring
X-Git-Tag: submit/tizen_tv/20150603.064601~1^2~549
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dbb9358dbee120fc7b67d1d40da5bdbb42cf8240;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[Contact] JS code refactoring

[Verification]
TCT without change

Change-Id: I7fb911d4ae44ea744d9a10df4019fae6afba2c29
Signed-off-by: Pawel Kaczmarek <p.kaczmarek3@samsung.com>
---

diff --git a/src/contact/js/address_book.js b/src/contact/js/address_book.js
index adb559d3..13544ee0 100644
--- a/src/contact/js/address_book.js
+++ b/src/contact/js/address_book.js
@@ -87,17 +87,17 @@ var _contactChangeListener = function(result) {
 
 
 var AddressBook = function(accountId, name) {
-  AV.isConstructorCall(this, AddressBook);
+  validator_.isConstructorCall(this, AddressBook);
 
   var id_ = null;
   var name_ = '';
   var readOnly_ = false;
   var accountId_ = null;
 
-  if (Type.isNumber(accountId)) {
+  if (type_.isNumber(accountId)) {
     accountId_ = accountId;
   }
-  if (Type.isString(name)) {
+  if (type_.isString(name)) {
     name_ = name;
   }
 
@@ -108,7 +108,7 @@ var AddressBook = function(accountId, name) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          id_ = Converter.toString(v, false);
+          id_ = converter_.toString(v, false);
         }
       },
       enumerable: true
@@ -119,7 +119,7 @@ var AddressBook = function(accountId, name) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          accountId_ = Converter.toLong(v, true);
+          accountId_ = converter_.toLong(v, true);
         }
       },
       enumerable: true
@@ -130,7 +130,7 @@ var AddressBook = function(accountId, name) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          name_ = Converter.toString(v, false);
+          name_ = converter_.toString(v, false);
         }
       },
       enumerable: true
@@ -141,7 +141,7 @@ var AddressBook = function(accountId, name) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          readOnly_ = Converter.toBoolean(v, false);
+          readOnly_ = converter_.toBoolean(v, false);
         }
       },
       enumerable: true
@@ -150,14 +150,14 @@ var AddressBook = function(accountId, name) {
 };
 
 AddressBook.prototype.get = function() {
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'id',
-    type: AV.Types.STRING,
+    type: types_.STRING,
     optional: false,
     nullable: false
   }]);
 
-  if (String(Converter.toLong(args.id)) !== args.id) {
+  if (String(converter_.toLong(args.id)) !== args.id) {
     // TCT: AddressBook_get_id_invalid
     throw new tizen.WebAPIException(tizen.WebAPIException.INVALID_VALUES_ERR);
   }
@@ -177,15 +177,15 @@ AddressBook.prototype.get = function() {
 
     if (contact.name instanceof ContactName) {
       contact.name.displayName = '';
-      if (Type.isString(contact.name.firstName)) {
+      if (type_.isString(contact.name.firstName)) {
         contact.name.displayName = contact.name.firstName;
-        if (Type.isString(contact.name.lastName)) {
+        if (type_.isString(contact.name.lastName)) {
           contact.name.displayName += ' ' + contact.name.lastName;
         }
-      } else if (Type.isArray(contact.name.nicknames) &&
-          Type.isString(contact.name.nicknames[0])) {
+      } else if (type_.isArray(contact.name.nicknames) &&
+          type_.isString(contact.name.nicknames[0])) {
         contact.name.displayName = contact.name.nicknames[0];
-      } else if (Type.isString(contact.name.nicknames)) {
+      } else if (type_.isString(contact.name.nicknames)) {
         contact.name.displayName = contact.name.nicknames;
       }
     }
@@ -197,10 +197,10 @@ AddressBook.prototype.get = function() {
 };
 
 AddressBook.prototype.add = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'contact',
-      type: AV.Types.PLATFORM_OBJECT,
+      type: types_.PLATFORM_OBJECT,
       values: Contact,
       optional: false,
       nullable: false
@@ -227,15 +227,15 @@ AddressBook.prototype.add = function() {
 
     if (args.contact.name instanceof ContactName) {
       args.contact.name.displayName = '';
-      if (Type.isString(args.contact.name.firstName)) {
+      if (type_.isString(args.contact.name.firstName)) {
         args.contact.name.displayName = args.contact.name.firstName;
-        if (Type.isString(args.contact.name.lastName)) {
+        if (type_.isString(args.contact.name.lastName)) {
           args.contact.name.displayName += ' ' + args.contact.name.lastName;
         }
-      } else if (Type.isArray(args.contact.name.nicknames) &&
-          Type.isString(args.contact.name.nicknames[0])) {
+      } else if (type_.isArray(args.contact.name.nicknames) &&
+          type_.isString(args.contact.name.nicknames[0])) {
         args.contact.name.displayName = args.contact.name.nicknames[0];
-      } else if (Type.isString(args.contact.name.nicknames)) {
+      } else if (type_.isString(args.contact.name.nicknames)) {
         args.contact.name.displayName = args.contact.name.nicknames;
       }
     }
@@ -243,23 +243,23 @@ AddressBook.prototype.add = function() {
 };
 
 AddressBook.prototype.addBatch = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'contacts',
-      type: AV.Types.ARRAY,
+      type: types_.ARRAY,
       value: Contact,
       optional: false,
       nullable: false
     },
     {
       name: 'successCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     },
     {
       name: 'errorCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     }
@@ -293,10 +293,10 @@ AddressBook.prototype.addBatch = function() {
 };
 
 AddressBook.prototype.update = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'contact',
-      type: AV.Types.PLATFORM_OBJECT,
+      type: types_.PLATFORM_OBJECT,
       values: Contact,
       optional: false,
       nullable: false
@@ -323,23 +323,23 @@ AddressBook.prototype.update = function() {
 };
 
 AddressBook.prototype.updateBatch = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'contacts',
-      type: AV.Types.ARRAY,
+      type: types_.ARRAY,
       values: Contact,
       optional: false,
       nullable: false
     },
     {
       name: 'successCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     },
     {
       name: 'errorCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     }
@@ -372,14 +372,14 @@ AddressBook.prototype.updateBatch = function() {
 };
 
 AddressBook.prototype.remove = function() {
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'id',
-    type: AV.Types.STRING,
+    type: types_.STRING,
     optional: false,
     nullable: false
   }]);
 
-  if (String(Converter.toLong(args.id)) !== args.id) {
+  if (String(converter_.toLong(args.id)) !== args.id) {
     // TCT: AddressBook_remove_id_invalid
     throw new tizen.WebAPIException(tizen.WebAPIException.INVALID_VALUES_ERR);
   }
@@ -395,23 +395,23 @@ AddressBook.prototype.remove = function() {
 };
 
 AddressBook.prototype.removeBatch = function(ids, successCallback, errorCallback) {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'ids',
-      type: AV.Types.ARRAY,
-      values: AV.Types.STRING,
+      type: types_.ARRAY,
+      values: types_.STRING,
       optional: false,
       nullable: false
     },
     {
       name: 'successCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     },
     {
       name: 'errorCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     }
@@ -433,22 +433,22 @@ AddressBook.prototype.removeBatch = function(ids, successCallback, errorCallback
 };
 
 AddressBook.prototype.find = function(successCallback, errorCallback, filter, sortMode) {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'successCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: false,
       nullable: false
     },
     {
       name: 'errorCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     },
     {
       name: 'filter',
-      type: AV.Types.PLATFORM_OBJECT,
+      type: types_.PLATFORM_OBJECT,
       values: [
         tizen.AttributeFilter,
         tizen.AttributeRangeFilter,
@@ -459,7 +459,7 @@ AddressBook.prototype.find = function(successCallback, errorCallback, filter, so
     },
     {
       name: 'sortMode',
-      type: AV.Types.PLATFORM_OBJECT,
+      type: types_.PLATFORM_OBJECT,
       values: tizen.SortMode,
       optional: true,
       nullable: true
@@ -502,20 +502,20 @@ AddressBook.prototype.find = function(successCallback, errorCallback, filter, so
 };
 
 AddressBook.prototype.addChangeListener = function() {
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'successCallback',
-    type: AV.Types.LISTENER,
+    type: types_.LISTENER,
     values: ['oncontactsadded', 'oncontactsupdated', 'oncontactsremoved'],
     optional: false,
     nullable: false
   }, {
     name: 'errorCallback',
-    type: AV.Types.FUNCTION,
+    type: types_.FUNCTION,
     optional: true,
     nullable: true
   }]);
 
-  if (Type.isEmptyObject(_contactCallbackMap)) {
+  if (type_.isEmptyObject(_contactCallbackMap)) {
     var result = native_.callSync('AddressBook_startListening', {});
 
     if (native_.isFailure(result)) {
@@ -543,10 +543,10 @@ AddressBook.prototype.addChangeListener = function() {
 };
 
 AddressBook.prototype.removeChangeListener = function(watchId) {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'watchId',
-      type: AV.Types.LONG,
+      type: types_.LONG,
       optional: false,
       nullable: false
     }
@@ -565,11 +565,11 @@ AddressBook.prototype.removeChangeListener = function(watchId) {
 
   delete _contactCallbackMap[this.id][args.watchId];
 
-  if (Type.isEmptyObject(_contactCallbackMap[this.id])) {
+  if (type_.isEmptyObject(_contactCallbackMap[this.id])) {
     delete _contactCallbackMap[this.id];
   }
 
-  if (Type.isEmptyObject(_contactCallbackMap)) {
+  if (type_.isEmptyObject(_contactCallbackMap)) {
     native_.removeListener('ContactChangeListener', _contactChangeListener);
     _contactListenerRegistered = false;
 
@@ -582,14 +582,14 @@ AddressBook.prototype.removeChangeListener = function(watchId) {
 };
 
 AddressBook.prototype.getGroup = function() {
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'groupId',
-    type: AV.Types.STRING,
+    type: types_.STRING,
     optional: false,
     nullable: false
   }]);
 
-  if (String(Converter.toLong(args.groupId)) !== args.groupId) {
+  if (String(converter_.toLong(args.groupId)) !== args.groupId) {
     // TCT: AddressBook_getGroup_groupId_invalid
     throw new tizen.WebAPIException(tizen.WebAPIException.INVALID_VALUES_ERR);
   }
@@ -608,10 +608,10 @@ AddressBook.prototype.getGroup = function() {
 };
 
 AddressBook.prototype.addGroup = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'group',
-      type: AV.Types.PLATFORM_OBJECT,
+      type: types_.PLATFORM_OBJECT,
       values: ContactGroup,
       optional: false,
       nullable: false
@@ -632,10 +632,10 @@ AddressBook.prototype.addGroup = function() {
 };
 
 AddressBook.prototype.updateGroup = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'group',
-      type: AV.Types.PLATFORM_OBJECT,
+      type: types_.PLATFORM_OBJECT,
       values: ContactGroup,
       optional: false,
       nullable: false
@@ -650,14 +650,14 @@ AddressBook.prototype.updateGroup = function() {
 };
 
 AddressBook.prototype.removeGroup = function() {
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'groupId',
-    type: AV.Types.STRING,
+    type: types_.STRING,
     optional: false,
     nullable: false
   }]);
 
-  if (String(Converter.toLong(args.groupId)) !== args.groupId) {
+  if (String(converter_.toLong(args.groupId)) !== args.groupId) {
     // TCT: AddressBook_removeGroup_groupId_invalid
     throw new tizen.WebAPIException(tizen.WebAPIException.INVALID_VALUES_ERR);
   }
diff --git a/src/contact/js/common.js b/src/contact/js/common.js
index ce1140da..5db0caf3 100644
--- a/src/contact/js/common.js
+++ b/src/contact/js/common.js
@@ -4,12 +4,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-var _common = xwalk.utils;
-var Type = _common.type;
-var Converter = _common.converter;
-var AV = _common.validator;
-
-var native_ = new _common.NativeManager(extension);
+var utils_ = xwalk.utils;
+var type_ = utils_.type;
+var converter_ = utils_.converter;
+var validator_ = utils_.validator;
+var types_ = validator_.Types;
+var native_ = new xwalk.utils.NativeManager(extension);
 
 var _currentWatchId = 1;
 
@@ -21,13 +21,13 @@ var _getNextWatchId = function() {
 // Currently only translates JS Date
 var _toJsonObject = function(obj) {
   var ret;
-  if (Type.isDate(obj)) {
+  if (type_.isDate(obj)) {
     var year = ('0000' + obj.getFullYear()).slice(-4);
     var month = ('00' + (obj.getMonth() + 1)).slice(-2);
     var day = ('00' + obj.getDate()).slice(-2);
     return Number(year + month + day);
   }
-  if (Type.isArray(obj)) {
+  if (type_.isArray(obj)) {
     ret = [];
     for (var i = 0; i < obj.length; ++i) {
       ret[i] = _toJsonObject(obj[i]);
@@ -56,7 +56,7 @@ var _fromJsonDate = function(date) {
 
 var _promote = function(val, type) {
   return _editGuard.run(function() {
-    if (Type.isArray(val)) {
+    if (type_.isArray(val)) {
       var ret = [];
       for (var i = 0; i < val.length; ++i) {
         ret.push(new type(val[i]));
@@ -138,7 +138,7 @@ Common.prototype.sort = function(arr, sortMode) {
 };
 
 Common.prototype.filter = function(arr, filter) {
-  if (Type.isNullOrUndefined(arr))
+  if (type_.isNullOrUndefined(arr))
     return arr;
   if (filter instanceof tizen.AttributeFilter ||
       filter instanceof tizen.AttributeRangeFilter ||
@@ -163,8 +163,8 @@ Common.prototype.repackFilter = function (filter) {
     return {
       filterType: 'AttributeRangeFilter',
       attributeName: filter.attributeName,
-      initialValue: Type.isNullOrUndefined(filter.initialValue) ? null : filter.initialValue,
-      endValue: Type.isNullOrUndefined(filter.endValue) ? null : filter.endValue
+      initialValue: type_.isNullOrUndefined(filter.initialValue) ? null : filter.initialValue,
+      endValue: type_.isNullOrUndefined(filter.endValue) ? null : filter.endValue
     };
   }
   if (filter instanceof tizen.CompositeFilter) {
diff --git a/src/contact/js/contact.js b/src/contact/js/contact.js
index cecc8433..228ac514 100644
--- a/src/contact/js/contact.js
+++ b/src/contact/js/contact.js
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 var Contact = function(data) {
-  AV.isConstructorCall(this, Contact);
+  validator_.isConstructorCall(this, Contact);
 
   var _forceEditMode = false;
-  if (Type.isString(data)) {
+  if (type_.isString(data)) {
     var result = native_.callSync('ContactManager_importFromVCard', {
       'contact': data
     });
@@ -22,7 +22,7 @@ var Contact = function(data) {
 
     // Force edit mode so that anonymous objects can be promoted to their correct types.
     _forceEditMode = true;
-  } else if (Type.isObject(data) || Type.isFunction(data)) {
+  } else if (type_.isObject(data) || type_.isFunction(data)) {
     // It's a dictionary
   } else {
     // null or invalid types.
@@ -52,12 +52,12 @@ var Contact = function(data) {
   var _groupIds = [];
 
   var _sanitizeArray = function(arr, type, previousValue) {
-    if (!Type.isArray(arr)) {
+    if (!type_.isArray(arr)) {
       return previousValue;
     }
     for (var i = 0; i < arr.length; ++i) {
-      if (Type.isString(type)) {
-        if (!Type.isString(arr[i])) {
+      if (type_.isString(type)) {
+        if (!type_.isString(arr[i])) {
           return previousValue;
         }
       } else if (_editGuard.isEditEnabled()) {
@@ -76,7 +76,7 @@ var Contact = function(data) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _id = Converter.toString(v, false);
+          _id = converter_.toString(v, false);
         }
       },
       enumerable: true
@@ -87,7 +87,7 @@ var Contact = function(data) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _personId = Converter.toString(v, false);
+          _personId = converter_.toString(v, false);
         }
       },
       enumerable: true
@@ -98,7 +98,7 @@ var Contact = function(data) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _addressBookId = Converter.toString(v, false);
+          _addressBookId = converter_.toString(v, false);
         }
       },
       enumerable: true
@@ -111,7 +111,7 @@ var Contact = function(data) {
         if (_editGuard.isEditEnabled()) {
           if (v instanceof Date || v === null) {
             _lastUpdate = v;
-          } else if (Type.isString(v)) {
+          } else if (type_.isString(v)) {
             _lastUpdate = new Date(v);
           } else {
             _lastUpdate = _fromJsonDate(v);
@@ -126,7 +126,7 @@ var Contact = function(data) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _isFavorite = Converter.toBoolean(v, false);
+          _isFavorite = converter_.toBoolean(v, false);
         }
       },
       enumerable: true
@@ -158,7 +158,7 @@ var Contact = function(data) {
         return _photoURI;
       },
       set: function(v) {
-        _photoURI = Converter.toString(v, true);
+        _photoURI = converter_.toString(v, true);
       },
       enumerable: true
     },
@@ -205,7 +205,7 @@ var Contact = function(data) {
       set: function(v) {
         if (v instanceof Date || v === null) {
           _birthday = v;
-        } else if (Type.isString(v)) {
+        } else if (type_.isString(v)) {
           _birthday = new Date(v);
         } else if (_editGuard.isEditEnabled()) {
           _birthday = _fromJsonDate(v);
@@ -254,7 +254,7 @@ var Contact = function(data) {
         return _ringtoneURI;
       },
       set: function(v) {
-        _ringtoneURI = Converter.toString(v, true);
+        _ringtoneURI = converter_.toString(v, true);
       },
       enumerable: true
     },
@@ -263,7 +263,7 @@ var Contact = function(data) {
         return _messageAlertURI;
       },
       set: function(v) {
-        _messageAlertURI = Converter.toString(v, true);
+        _messageAlertURI = converter_.toString(v, true);
       },
       enumerable: true
     },
@@ -272,7 +272,7 @@ var Contact = function(data) {
         return _vibrationURI;
       },
       set: function(v) {
-        _vibrationURI = Converter.toString(v, true);
+        _vibrationURI = converter_.toString(v, true);
       },
       enumerable: true
     },
@@ -319,7 +319,7 @@ var _contactAddressToString = function(obj) {
     }
     str += 'ADR;';
     for (var addType in it.types) {
-      if (Type.isString(addType)) {
+      if (type_.isString(addType)) {
         str += addType + ',';
       }
     }
@@ -341,13 +341,13 @@ var _contactAddressToString = function(obj) {
 
 // Convert email address from Contact object to string
 var _contactEmailToString = function(obj) {
-  if (!Type.isArray(obj.emails) || obj.emails.length === 0) {
+  if (!type_.isArray(obj.emails) || obj.emails.length === 0) {
     console.log('Empty email list');
     return '';
   }
   var str = '';
   for (var mail in obj.emails) {
-    if (!mail instanceof ContactEmailAddress || !Type.isArray(mail.types) ||
+    if (!mail instanceof ContactEmailAddress || !type_.isArray(mail.types) ||
       mail.types.length === 0) {
       console.log('Incorrect email type');
       continue;
@@ -355,14 +355,14 @@ var _contactEmailToString = function(obj) {
     str += 'EMAIL;';
     // set types
     for (var type in mail.types) {
-      if (Type.isString(type)) {
+      if (type_.isString(type)) {
         str += type + ',';
       }
     }
     if (str.charAt(str.length - 1) === ',') {
       str[str.length - 1] = ':';
     }
-    str += '=' + Converter.toString(mail.email) + '\n';
+    str += '=' + converter_.toString(mail.email) + '\n';
   }
   return str;
 };
@@ -413,7 +413,7 @@ var _contactPhoneNumbersToString = function(obj) {
     }
     str += 'TEL';
     for (var type in phone.types) {
-      if (Type.isString(type)) {
+      if (type_.isString(type)) {
         str += ';' + type;
       }
     }
@@ -488,7 +488,7 @@ var _JSONToContactType = function(type, obj) {
 
   for (var prop in obj) {
     if (contact.hasOwnProperty(prop)) {
-      if (contact[prop] instanceof Date && Type.isNumber(obj[prop])) {
+      if (contact[prop] instanceof Date && type_.isNumber(obj[prop])) {
         contact[prop] = new Date(1000 * obj[prop]);
       } else {
         contact[prop] = obj[prop];
@@ -503,7 +503,7 @@ var _JSONToContactType = function(type, obj) {
 Contact.prototype.convertToString = function(format) {
   format = format || TypeEnum[0];
 
-  if (!Type.isString(format)) {
+  if (!type_.isString(format)) {
     throw new tizen.WebAPIException(tizen.WebAPIException.TYPE_MISMATCH_ERR, 'Invalid format');
   }
 
diff --git a/src/contact/js/contact_data_structures.js b/src/contact/js/contact_data_structures.js
index eab62563..78586db9 100644
--- a/src/contact/js/contact_data_structures.js
+++ b/src/contact/js/contact_data_structures.js
@@ -41,7 +41,7 @@ var ContactInstantMessengerType = {
 // class ContactRef ////////////////////////////////////////////////////////
 
 var ContactRef = function(data) {
-  AV.isConstructorCall(this, ContactRef);
+  validator_.isConstructorCall(this, ContactRef);
   var _contactId = '';
   var _addressBookId = '';
   Object.defineProperties(this, {
@@ -50,7 +50,7 @@ var ContactRef = function(data) {
         return _addressBookId;
       },
       set: function(v) {
-        _addressBookId = Converter.toString(v, false);
+        _addressBookId = converter_.toString(v, false);
       },
       enumerable: true
     },
@@ -59,27 +59,27 @@ var ContactRef = function(data) {
         return _contactId;
       },
       set: function(v) {
-        _contactId = Converter.toString(v, false);
+        _contactId = converter_.toString(v, false);
       },
       enumerable: true
     }
   });
 
-  if (Type.isObject(data)) {
+  if (type_.isObject(data)) {
     this.addressBookId = data.addressBookId;
     this.contactId = data.contactId;
   } else {
     try {
-      var args = AV.validateArgs(arguments, [
+      var args = validator_.validateArgs(arguments, [
         {
           name: 'addressBookId',
-          type: AV.Types.STRING,
+          type: types_.STRING,
           optional: false,
           nullable: false
         },
         {
           name: 'contactId',
-          type: AV.Types.STRING,
+          type: types_.STRING,
           optional: false,
           nullable: false
         }
@@ -95,7 +95,7 @@ var ContactRef = function(data) {
 // class ContactGroup //////////////////////////////////////////////////
 
 var ContactGroup = function(name, ringtone, photo) {
-  AV.isConstructorCall(this, ContactGroup);
+  validator_.isConstructorCall(this, ContactGroup);
 
   var _id = null;
   var _address = null;
@@ -104,15 +104,15 @@ var ContactGroup = function(name, ringtone, photo) {
   var _ringtoneURI = null;
   var _photoURI = null;
 
-  if (name && Type.isString(name)) {
+  if (name && type_.isString(name)) {
     _name = name.length ? name : '';
   }
 
-  if (ringtone && Type.isString(ringtone)) {
+  if (ringtone && type_.isString(ringtone)) {
     _ringtoneURI = ringtone.length ? ringtone : null;
   }
 
-  if (photo && Type.isString(photo)) {
+  if (photo && type_.isString(photo)) {
     _photoURI = photo.length ? photo : null;
   }
 
@@ -123,7 +123,7 @@ var ContactGroup = function(name, ringtone, photo) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _id = Converter.toString(v, true);
+          _id = converter_.toString(v, true);
         }
       },
       enumerable: true
@@ -134,7 +134,7 @@ var ContactGroup = function(name, ringtone, photo) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _address = Converter.toString(v, true);
+          _address = converter_.toString(v, true);
         }
       },
       enumerable: true
@@ -144,7 +144,7 @@ var ContactGroup = function(name, ringtone, photo) {
         return _name;
       },
       set: function(v) {
-        _name = Converter.toString(v, false);
+        _name = converter_.toString(v, false);
       },
       enumerable: true
     },
@@ -153,7 +153,7 @@ var ContactGroup = function(name, ringtone, photo) {
         return _ringtoneURI;
       },
       set: function(v) {
-        _ringtoneURI = Converter.toString(v, true);
+        _ringtoneURI = converter_.toString(v, true);
       },
       enumerable: true
     },
@@ -162,7 +162,7 @@ var ContactGroup = function(name, ringtone, photo) {
         return _photoURI;
       },
       set: function(v) {
-        _photoURI = Converter.toString(v, true);
+        _photoURI = converter_.toString(v, true);
       },
       enumerable: true
     },
@@ -172,7 +172,7 @@ var ContactGroup = function(name, ringtone, photo) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _readOnly = Converter.toBoolean(v, false);
+          _readOnly = converter_.toBoolean(v, false);
         }
       },
       enumerable: true
@@ -181,7 +181,7 @@ var ContactGroup = function(name, ringtone, photo) {
 
   if (_editGuard.isEditEnabled()) {
     var data = arguments[0];
-    if (Type.isObject(data)) {
+    if (type_.isObject(data)) {
       for (var prop in data) {
         if (this.hasOwnProperty(prop)) {
           this[prop] = data[prop];
@@ -194,30 +194,30 @@ var ContactGroup = function(name, ringtone, photo) {
 // class ContactEmailAddress ///////////////////////////////////////////
 
 var ContactEmailAddress = function(address, types, isDefault) {
-  AV.isConstructorCall(this, ContactEmailAddress);
+  validator_.isConstructorCall(this, ContactEmailAddress);
 
   var _email = '';
   var _label = null;
   var _isDefault = false;
   var _types = ['WORK'];
 
-  if (Type.isString(address) && address.indexOf('@') > 0 &&
+  if (type_.isString(address) && address.indexOf('@') > 0 &&
       address.indexOf('@') !== (address.length - 1)) {
     _email = address;
   }
 
-  if (Type.isBoolean(isDefault)) {
+  if (type_.isBoolean(isDefault)) {
     _isDefault = isDefault;
   }
 
-  if (Type.isArray(types)) {
+  if (type_.isArray(types)) {
     _types = [];
     for (var i = 0; i < types.length; ++i) {
-      if (Type.isString(types[i])) {
+      if (type_.isString(types[i])) {
         _types.push(types[i]);
       }
     }
-  } else if (Type.isString(types)) {
+  } else if (type_.isString(types)) {
     _types = [];
     _types.push(types);
   }
@@ -228,7 +228,7 @@ var ContactEmailAddress = function(address, types, isDefault) {
         return _email;
       },
       set: function(v) {
-        if (Type.isString(v) && v.indexOf('@') > 0 &&
+        if (type_.isString(v) && v.indexOf('@') > 0 &&
             v.indexOf('@') !== (v.length - 1)) {
           _email = v;
         }
@@ -240,7 +240,7 @@ var ContactEmailAddress = function(address, types, isDefault) {
         return _isDefault;
       },
       set: function(v) {
-        _isDefault = Converter.toBoolean(v, false);
+        _isDefault = converter_.toBoolean(v, false);
       },
       enumerable: true
     },
@@ -249,14 +249,14 @@ var ContactEmailAddress = function(address, types, isDefault) {
         return _types;
       },
       set: function(v) {
-        if (Type.isArray(v)) {
+        if (type_.isArray(v)) {
           _types = [];
           for (var i = 0; i < v.length; ++i) {
-            if (Type.isString(v[i])) {
+            if (type_.isString(v[i])) {
               _types.push(v[i]);
             }
           }
-        } else if (Type.isString(v)) {
+        } else if (type_.isString(v)) {
           _types = [];
           _types.push(v);
         }
@@ -268,7 +268,7 @@ var ContactEmailAddress = function(address, types, isDefault) {
         return _label;
       },
       set: function(v) {
-        _label = Converter.toString(v, true);
+        _label = converter_.toString(v, true);
       },
       enumerable: true
     }
@@ -286,27 +286,27 @@ var ContactEmailAddress = function(address, types, isDefault) {
 // class ContactPhoneNumber ////////////////////////////////////////////
 
 var ContactPhoneNumber = function(number, type, isDefault) {
-  AV.isConstructorCall(this, ContactPhoneNumber);
+  validator_.isConstructorCall(this, ContactPhoneNumber);
 
   var _isDefault = false;
   var _number = '';
   var _types = ['VOICE'];
 
-  if (Type.isString(number)) {
+  if (type_.isString(number)) {
     _number = number;
   }
 
-  if (Type.isArray(type)) {
+  if (type_.isArray(type)) {
     _types = [];
     for (var i = 0; i < type.length; ++i) {
-      _types.push(Converter.toString(type[i], false));
+      _types.push(converter_.toString(type[i], false));
     }
-  } else if (Type.isString(type)) {
+  } else if (type_.isString(type)) {
     _types = [];
     _types.push(type, false);
   }
 
-  if (Type.isBoolean(isDefault)) {
+  if (type_.isBoolean(isDefault)) {
     _isDefault = isDefault;
   }
 
@@ -316,7 +316,7 @@ var ContactPhoneNumber = function(number, type, isDefault) {
         return _number;
       },
       set: function(v) {
-        _number = Converter.toString(v, false);
+        _number = converter_.toString(v, false);
       },
       enumerable: true
     },
@@ -325,7 +325,7 @@ var ContactPhoneNumber = function(number, type, isDefault) {
         return _isDefault;
       },
       set: function(v) {
-        _isDefault = Converter.toBoolean(v, false);
+        _isDefault = converter_.toBoolean(v, false);
       },
       enumerable: true
     },
@@ -334,12 +334,12 @@ var ContactPhoneNumber = function(number, type, isDefault) {
         return _types;
       },
       set: function(v) {
-        if (Type.isArray(v)) {
+        if (type_.isArray(v)) {
           _types = [];
           for (var i = 0; i < v.length; ++i) {
-            _types.push(Converter.toString(v[i], false));
+            _types.push(converter_.toString(v[i], false));
           }
-        } else if (Type.isString(v)) {
+        } else if (type_.isString(v)) {
           _types = [];
           _types.push(v, false);
         }
@@ -365,7 +365,7 @@ var ContactPhoneNumber = function(number, type, isDefault) {
 // class ContactAddress ////////////////////////////////////////////////
 
 var ContactAddress = function(data) {
-  AV.isConstructorCall(this, ContactAddress);
+  validator_.isConstructorCall(this, ContactAddress);
 
   var _isDefault = false;
   var _types = ['HOME'];
@@ -406,7 +406,7 @@ var ContactAddress = function(data) {
         return _isDefault;
       },
       set: function(v) {
-        _isDefault = Converter.toBoolean(v, false);
+        _isDefault = converter_.toBoolean(v, false);
       },
       enumerable: true
     },
@@ -415,13 +415,13 @@ var ContactAddress = function(data) {
         return _types;
       },
       set: function(v) {
-        if (Type.isString(v)) {
+        if (type_.isString(v)) {
           _types = [];
           _types.push(v);
-        } else if (Type.isArray(v)) {
+        } else if (type_.isArray(v)) {
           _types = [];
           for (var i = 0; i < v.length; ++i) {
-            if (Type.isString(v[i])) {
+            if (type_.isString(v[i])) {
               _types.push(v[i]);
             }
           }
@@ -436,7 +436,7 @@ var ContactAddress = function(data) {
     }
   });
 
-  if (Type.isObject(data)) {
+  if (type_.isObject(data)) {
     for (var prop in data) {
       if (this.hasOwnProperty(prop)) {
         this[prop] = data[prop];
@@ -448,7 +448,7 @@ var ContactAddress = function(data) {
 // class ContactAnniversary ////////////////////////////////////////////////
 
 var ContactAnniversary = function(anniversary_date, anniversary_label) {
-  AV.isConstructorCall(this, ContactAnniversary);
+  validator_.isConstructorCall(this, ContactAnniversary);
 
   var _anniversary_date = new Date();
   var _anniversary_label = null;
@@ -468,7 +468,7 @@ var ContactAnniversary = function(anniversary_date, anniversary_label) {
         return _anniversary_label;
       },
       set: function(v) {
-        _anniversary_label = Converter.toString(v, true);
+        _anniversary_label = converter_.toString(v, true);
       },
       enumerable: true
     }
@@ -478,10 +478,10 @@ var ContactAnniversary = function(anniversary_date, anniversary_label) {
     _anniversary_date = _fromJsonDate(arguments[0].date);
     _anniversary_label = arguments[0].label;
   } else {
-    if (Type.isDate(anniversary_date)) {
+    if (type_.isDate(anniversary_date)) {
       _anniversary_date = anniversary_date;
     }
-    if (Type.isString(anniversary_label)) {
+    if (type_.isString(anniversary_label)) {
       _anniversary_label = anniversary_label;
     }
   }
@@ -490,15 +490,15 @@ var ContactAnniversary = function(anniversary_date, anniversary_label) {
 // class ContactWebSite ////////////////////////////////////////////////////
 
 var ContactWebSite = function(contact_url, contact_type) {
-  AV.isConstructorCall(this, ContactWebSite);
+  validator_.isConstructorCall(this, ContactWebSite);
 
   var _url = '';
   var _type = 'HOMEPAGE';
 
-  if (Type.isString(contact_url)) {
+  if (type_.isString(contact_url)) {
     _url = contact_url;
   }
-  if (Type.isString(contact_type)) {
+  if (type_.isString(contact_type)) {
     _type = contact_type;
   }
 
@@ -508,7 +508,7 @@ var ContactWebSite = function(contact_url, contact_type) {
         return _url;
       },
       set: function(v) {
-        _url = Converter.toString(v, false);
+        _url = converter_.toString(v, false);
       },
       enumerable: true
     },
@@ -517,7 +517,7 @@ var ContactWebSite = function(contact_url, contact_type) {
         return _type;
       },
       set: function(v) {
-        _type = Converter.toString(v, false);
+        _type = converter_.toString(v, false);
       },
       enumerable: true
     }
@@ -527,7 +527,7 @@ var ContactWebSite = function(contact_url, contact_type) {
 // class ContactOrganization ///////////////////////////////////////////////
 
 var ContactOrganization = function(data) {
-  AV.isConstructorCall(this, ContactOrganization);
+  validator_.isConstructorCall(this, ContactOrganization);
   Object.defineProperties(this, {
     name: {
       value: null,
@@ -556,7 +556,7 @@ var ContactOrganization = function(data) {
     }
   });
 
-  if (Type.isObject(data)) {
+  if (type_.isObject(data)) {
     for (var prop in data) {
       if (this.hasOwnProperty(prop)) {
         this[prop] = data[prop];
@@ -568,7 +568,7 @@ var ContactOrganization = function(data) {
 // class ContactName ///////////////////////////////////////////////////////
 
 var ContactName = function(data) {
-  AV.isConstructorCall(this, ContactName);
+  validator_.isConstructorCall(this, ContactName);
 
   var _displayName = null;
   var _nicknames = [];
@@ -604,7 +604,7 @@ var ContactName = function(data) {
         return _nicknames;
       },
       set: function(nicknames) {
-        if (Type.isArray(nicknames)) {
+        if (type_.isArray(nicknames)) {
           _nicknames = nicknames;
         }
       },
@@ -631,14 +631,14 @@ var ContactName = function(data) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _displayName = Converter.toString(v, true);
+          _displayName = converter_.toString(v, true);
         }
       },
       enumerable: true
     }
   });
 
-  if (Type.isObject(data)) {
+  if (type_.isObject(data)) {
     for (var prop in data) {
       if (this.hasOwnProperty(prop)) {
         this[prop] = data[prop];
@@ -648,10 +648,10 @@ var ContactName = function(data) {
 };
 
 var ContactRelationship = function(relativeName, type) {
-  AV.isConstructorCall(this, ContactRelationship);
+  validator_.isConstructorCall(this, ContactRelationship);
 
-  var _relativeName = Converter.toString(relativeName, false);
-  var _type = type ? Converter.toEnum(type, Object.keys(ContactRelationshipType), false)
+  var _relativeName = converter_.toString(relativeName, false);
+  var _type = type ? converter_.toEnum(type, Object.keys(ContactRelationshipType), false)
             : ContactRelationshipType.OTHER;
   var _label = null;
 
@@ -661,7 +661,7 @@ var ContactRelationship = function(relativeName, type) {
         return _relativeName;
       },
       set: function (v) {
-        _relativeName = Converter.toString(v, false);
+        _relativeName = converter_.toString(v, false);
       },
       enumerable: true
     },
@@ -670,7 +670,7 @@ var ContactRelationship = function(relativeName, type) {
         return _type;
       },
       set: function (v) {
-        _type = v ? Converter.toEnum(v, Object.keys(ContactRelationshipType), false)
+        _type = v ? converter_.toEnum(v, Object.keys(ContactRelationshipType), false)
                   : _type;
       },
       enumerable: true
@@ -680,7 +680,7 @@ var ContactRelationship = function(relativeName, type) {
         return _label;
       },
       set: function (v) {
-        _label = Converter.toString(v, true);
+        _label = converter_.toString(v, true);
       },
       enumerable: true
     }
@@ -688,33 +688,33 @@ var ContactRelationship = function(relativeName, type) {
 };
 
 var ContactInstantMessenger = function(imAddress, type) {
-  AV.isConstructorCall(this, ContactInstantMessenger);
+  validator_.isConstructorCall(this, ContactInstantMessenger);
 
-  var imAddress_ = '';
-  var type_ = 'OTHER';
+  var _imAddress = '';
+  var _type = 'OTHER';
 
   Object.defineProperties(this, {
     imAddress: {
       get: function() {
-        return imAddress_;
+        return _imAddress;
       },
       set: function(v) {
-        if (Type.isNullOrUndefined(v)) {
+        if (type_.isNullOrUndefined(v)) {
           return;
         }
-        imAddress_ = Converter.toString(v, false);
+        _imAddress = converter_.toString(v, false);
       },
       enumerable: true
     },
     type: {
       get: function() {
-        return type_;
+        return _type;
       },
       set: function(v) {
-        if (Type.isNullOrUndefined(v)) {
+        if (type_.isNullOrUndefined(v)) {
           return;
         }
-        type_ = Converter.toEnum(v, Object.keys(ContactInstantMessengerType), false);
+        _type = converter_.toEnum(v, Object.keys(ContactInstantMessengerType), false);
       },
       enumerable: true
     },
diff --git a/src/contact/js/contact_manager.js b/src/contact/js/contact_manager.js
index c27b5128..5fdf6a96 100644
--- a/src/contact/js/contact_manager.js
+++ b/src/contact/js/contact_manager.js
@@ -29,16 +29,16 @@ var ContactManager = function() {};
 
 // Gets the available address books
 ContactManager.prototype.getAddressBooks = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'successCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: false,
       nullable: false
     },
     {
       name: 'errorCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     }
@@ -94,14 +94,14 @@ ContactManager.prototype.getDefaultAddressBook = function() {
 
 // Gets the address book with the specified identifier.
 ContactManager.prototype.getAddressBook = function() {
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'addressBookId',
-    type: AV.Types.STRING,
+    type: types_.STRING,
     optional: false,
     nullable: false
   }]);
 
-  if (String(Converter.toLong(args.addressBookId)) !== args.addressBookId) {
+  if (String(converter_.toLong(args.addressBookId)) !== args.addressBookId) {
     // TCT: ContactManager_getAddressBook_addressBookId_invalid
     throw new tizen.WebAPIException(tizen.WebAPIException.NOT_FOUND_ERR);
   }
@@ -126,9 +126,9 @@ ContactManager.prototype.getAddressBook = function() {
 };
 
 ContactManager.prototype.addAddressBook = function() {
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'addressBook',
-    type: AV.Types.PLATFORM_OBJECT,
+    type: types_.PLATFORM_OBJECT,
     values: tizen.AddressBook,
     optional: false,
     nullable: false
@@ -154,13 +154,13 @@ ContactManager.prototype.addAddressBook = function() {
 
 ContactManager.prototype.removeAddressBook = function() {
   // TCT: ContactManager_removeAddressBook_misarg
-  if (Type.isNullOrUndefined(arguments[0])) {
+  if (type_.isNullOrUndefined(arguments[0])) {
     throw new tizen.WebAPIException(tizen.WebAPIException.INVALID_VALUES_ERR);
   }
 
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'addressBookId',
-    type: AV.Types.STRING,
+    type: types_.STRING,
     optional: false,
     nullable: false
   }]);
@@ -187,16 +187,16 @@ ContactManager.prototype.removeAddressBook = function() {
 // Gets the person with the specified identifier.
 ContactManager.prototype.get = function() {
   // validation
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'personId',
-      type: AV.Types.STRING,
+      type: types_.STRING,
       optional: false,
       nullable: false
     }
   ]);
 
-  if (String(Converter.toLong(args.personId)) !== args.personId) {
+  if (String(converter_.toLong(args.personId)) !== args.personId) {
     // TCT: ContactManager_get_personId_invalid
     throw new tizen.WebAPIException(tizen.WebAPIException.INVALID_VALUES_ERR);
   }
@@ -214,9 +214,9 @@ ContactManager.prototype.get = function() {
 // Updates a person in the address book synchronously.
 ContactManager.prototype.update = function() {
   // validation
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'person',
-    type: AV.Types.PLATFORM_OBJECT,
+    type: types_.PLATFORM_OBJECT,
     values: Person,
     optional: false,
     nullable: false
@@ -234,23 +234,23 @@ ContactManager.prototype.update = function() {
 
 // Updates several existing persons in the contact DB asynchronously.
 ContactManager.prototype.updateBatch = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'persons',
-      type: AV.Types.ARRAY,
+      type: types_.ARRAY,
       values: Person,
       optional: false,
       nullable: false
     },
     {
       name: 'successCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     },
     {
       name: 'errorCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     }
@@ -274,14 +274,14 @@ ContactManager.prototype.updateBatch = function() {
 // Removes a person from the contact DB synchronously.
 ContactManager.prototype.remove = function() {
   // validation
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'personId',
-    type: AV.Types.STRING,
+    type: types_.STRING,
     optional: false,
     nullable: false
   }]);
 
-  if (String(Converter.toLong(args.personId)) !== args.personId) {
+  if (String(converter_.toLong(args.personId)) !== args.personId) {
     // TCT: ContactManager_remove_personId_invalid
     throw new tizen.WebAPIException(tizen.WebAPIException.INVALID_VALUES_ERR);
   }
@@ -292,23 +292,23 @@ ContactManager.prototype.remove = function() {
 
 // Removes persons from contact DB asynchronously.
 ContactManager.prototype.removeBatch = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'personIds',
-      type: AV.Types.ARRAY,
-      values: AV.Types.STRING,
+      type: types_.ARRAY,
+      values: types_.STRING,
       optional: false,
       nullable: false
     },
     {
       name: 'successCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     },
     {
       name: 'errorCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     }
@@ -332,22 +332,22 @@ ContactManager.prototype.removeBatch = function() {
 // Gets an array of all Person objects from the contact DB or the ones that match the
 // optionally supplied filter.
 ContactManager.prototype.find = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'successCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: false,
       nullable: false
     },
     {
       name: 'errorCallback',
-      type: AV.Types.FUNCTION,
+      type: types_.FUNCTION,
       optional: true,
       nullable: true
     },
     {
       name: 'filter',
-      type: AV.Types.PLATFORM_OBJECT,
+      type: types_.PLATFORM_OBJECT,
       values: [tizen.AttributeFilter,
         tizen.AttributeRangeFilter,
         tizen.CompositeFilter],
@@ -356,7 +356,7 @@ ContactManager.prototype.find = function() {
     },
     {
       name: 'sortMode',
-      type: AV.Types.PLATFORM_OBJECT,
+      type: types_.PLATFORM_OBJECT,
       values: tizen.SortMode,
       optional: true,
       nullable: true
@@ -391,17 +391,17 @@ ContactManager.prototype.find = function() {
 
 // Subscribes to receive notifications about persons' changes.
 ContactManager.prototype.addChangeListener = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'successCallback',
-      type: AV.Types.LISTENER,
+      type: types_.LISTENER,
       values: ['onpersonsadded', 'onpersonsupdated', 'onpersonsremoved'],
       optional: false,
       nullable: false
     }
   ]);
 
-  if (Type.isEmptyObject(_personCallbackMap)) {
+  if (type_.isEmptyObject(_personCallbackMap)) {
     var result = native_.callSync('ContactManager_startListening', {});
 
     if (native_.isFailure(result)) {
@@ -423,10 +423,10 @@ ContactManager.prototype.addChangeListener = function() {
 
 // Unsubscribes a persons' changes watch operation.
 ContactManager.prototype.removeChangeListener = function() {
-  var args = AV.validateArgs(arguments, [
+  var args = validator_.validateArgs(arguments, [
     {
       name: 'watchId',
-      type: AV.Types.LONG,
+      type: types_.LONG,
       optional: false,
       nullable: false
     }
@@ -451,7 +451,7 @@ ContactManager.prototype.removeChangeListener = function() {
 
   delete _personCallbackMap[args.watchId];
 
-  if (Type.isEmptyObject(_personCallbackMap)) {
+  if (type_.isEmptyObject(_personCallbackMap)) {
     native_.removeListener('ContactPersonChangeListener', _personChangeListener);
     _personListenerRegistered = false;
 
diff --git a/src/contact/js/person.js b/src/contact/js/person.js
index d6c1ef5a..e8eb7319 100644
--- a/src/contact/js/person.js
+++ b/src/contact/js/person.js
@@ -4,7 +4,7 @@
 
 
 var Person = function(data) {
-  AV.isConstructorCall(this, Person);
+  validator_.isConstructorCall(this, Person);
 
   var _id = '';
   var _displayName = '';
@@ -14,25 +14,25 @@ var Person = function(data) {
   var _isFavorite = false;
   var _displayContactId = '';
 
-  if (data.hasOwnProperty('id') && Type.isString(data.id)) {
+  if (data.hasOwnProperty('id') && type_.isString(data.id)) {
     _id = data.id;
   }
-  if (data.hasOwnProperty('displayName') && Type.isString(data.displayName)) {
+  if (data.hasOwnProperty('displayName') && type_.isString(data.displayName)) {
     _displayName = data.displayName;
   }
-  if (data.hasOwnProperty('contactCount') && Type.isNumber(data.contactCount)) {
+  if (data.hasOwnProperty('contactCount') && type_.isNumber(data.contactCount)) {
     _contactCount = data.contactCount;
   }
-  if (data.hasOwnProperty('hasPhoneNumber') && Type.isBoolean(data.hasPhoneNumber)) {
+  if (data.hasOwnProperty('hasPhoneNumber') && type_.isBoolean(data.hasPhoneNumber)) {
     _hasPhoneNumber = data.hasPhoneNumber;
   }
-  if (data.hasOwnProperty('hasEmail') && Type.isBoolean(data.hasEmail)) {
+  if (data.hasOwnProperty('hasEmail') && type_.isBoolean(data.hasEmail)) {
     _hasEmail = data.hasEmail;
   }
-  if (data.hasOwnProperty('displayContactId') && Type.isString(data.displayContactId)) {
+  if (data.hasOwnProperty('displayContactId') && type_.isString(data.displayContactId)) {
     _displayContactId = data.displayContactId;
   }
-  if (data.hasOwnProperty('isFavorite') && Type.isBoolean(data.isFavorite)) {
+  if (data.hasOwnProperty('isFavorite') && type_.isBoolean(data.isFavorite)) {
     _isFavorite = data.isFavorite;
   }
 
@@ -43,7 +43,7 @@ var Person = function(data) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _id = Converter.toString(v, false);
+          _id = converter_.toString(v, false);
         }
       },
       enumerable: true
@@ -54,7 +54,7 @@ var Person = function(data) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _displayName = Converter.toString(v, false);
+          _displayName = converter_.toString(v, false);
         }
       },
       enumerable: true
@@ -65,7 +65,7 @@ var Person = function(data) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _contactCount = Converter.toLong(v, false);
+          _contactCount = converter_.toLong(v, false);
         }
       },
       enumerable: true
@@ -76,7 +76,7 @@ var Person = function(data) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _hasPhoneNumber = Converter.toBoolean(v, false);
+          _hasPhoneNumber = converter_.toBoolean(v, false);
         }
       },
       enumerable: true
@@ -87,7 +87,7 @@ var Person = function(data) {
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _hasEmail = Converter.toBoolean(v, false);
+          _hasEmail = converter_.toBoolean(v, false);
         }
       },
       enumerable: true
@@ -98,7 +98,7 @@ var Person = function(data) {
         return _isFavorite;
       },
       set: function(v) {
-        _isFavorite = Converter.toBoolean(v, false);
+        _isFavorite = converter_.toBoolean(v, false);
       },
       enumerable: true
     },
@@ -117,7 +117,7 @@ var Person = function(data) {
         return _displayContactId;
       },
       set: function(v) {
-        _displayContactId = Converter.toString(v, false);
+        _displayContactId = converter_.toString(v, false);
       },
       enumerable: true
     }
@@ -126,14 +126,14 @@ var Person = function(data) {
 
 // Aggregates another person to this person.
 Person.prototype.link = function() {
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'personId',
-    type: AV.Types.STRING,
+    type: types_.STRING,
     optional: false,
     nullable: false
   }]);
 
-  if (String(Converter.toLong(args.personId)) !== args.personId) {
+  if (String(converter_.toLong(args.personId)) !== args.personId) {
     // TCT: Person_link_personId_invalid
     throw new tizen.WebAPIException(tizen.WebAPIException.INVALID_VALUES_ERR);
   }
@@ -154,14 +154,14 @@ Person.prototype.link = function() {
 
 // Separates a contact from this person.
 Person.prototype.unlink = function(contactId) {
-  var args = AV.validateArgs(arguments, [{
+  var args = validator_.validateArgs(arguments, [{
     name: 'contactId',
-    type: AV.Types.STRING,
+    type: types_.STRING,
     optional: false,
     nullable: false
   }]);
 
-  if (String(Converter.toLong(args.contactId)) !== args.contactId) {
+  if (String(converter_.toLong(args.contactId)) !== args.contactId) {
     // TCT: Person_unlink_contactId_invalid
     throw new tizen.WebAPIException(tizen.WebAPIException.INVALID_VALUES_ERR);
   }