You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2012/06/11 23:21:11 UTC
[2/2] bada commit: CB-900 using org.apache.cordova namespace
CB-900 using org.apache.cordova namespace
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/commit/03adecf5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/tree/03adecf5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/diff/03adecf5
Branch: refs/heads/master
Commit: 03adecf5a74cbfde00c98e03a8b734201ceaba5b
Parents: 47b5bf3
Author: Anis Kadri <an...@gmail.com>
Authored: Mon Jun 11 14:20:12 2012 -0700
Committer: Anis Kadri <an...@gmail.com>
Committed: Mon Jun 11 14:20:12 2012 -0700
----------------------------------------------------------------------
Res/cordova/accelerometer.js | 6 ++--
Res/cordova/camera.js | 2 +-
Res/cordova/compass.js | 6 ++--
Res/cordova/contact.js | 12 ++++----
Res/cordova/cordova.js | 48 ++++++++++++++++++------------------
Res/cordova/debugconsole.js | 6 ++--
Res/cordova/geolocation.js | 6 ++--
Res/cordova/network.js | 2 +-
Res/cordova/notification.js | 8 +++---
src/Accelerometer.cpp | 6 ++--
src/Compass.cpp | 6 ++--
src/Contacts.cpp | 6 ++--
src/DebugConsole.cpp | 2 +-
src/GeoLocation.cpp | 6 ++--
src/Kamera.cpp | 2 +-
src/Network.cpp | 2 +-
src/Notification.cpp | 6 ++--
src/WebForm.cpp | 16 ++++++------
18 files changed, 74 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/Res/cordova/accelerometer.js
----------------------------------------------------------------------
diff --git a/Res/cordova/accelerometer.js b/Res/cordova/accelerometer.js
index c1f195b..b44ad45 100644
--- a/Res/cordova/accelerometer.js
+++ b/Res/cordova/accelerometer.js
@@ -61,7 +61,7 @@ Accelerometer.prototype.getCurrentAcceleration = function(successCallback, error
}
// Get acceleration
- Cordova.exec(successCallback, errorCallback, "com.cordova.Accelerometer", "getCurrentAcceleration", []);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Accelerometer", "getCurrentAcceleration", []);
};
/**
@@ -90,7 +90,7 @@ Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallb
}
// Start watch timer
this.id = Cordova.createUUID();
- Cordova.exec(successCallback, errorCallback, "com.cordova.Accelerometer", "watchAcceleration", []);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Accelerometer", "watchAcceleration", []);
return this.id;
};
@@ -103,7 +103,7 @@ Accelerometer.prototype.clearWatch = function(id) {
// Stop javascript timer & remove from timer list
if (id == this.id) {
- Cordova.exec(null, null, "com.cordova.Accelerometer", "clearWatch", []);
+ Cordova.exec(null, null, "org.apache.cordova.Accelerometer", "clearWatch", []);
}
};
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/Res/cordova/camera.js
----------------------------------------------------------------------
diff --git a/Res/cordova/camera.js b/Res/cordova/camera.js
index a44bc13..91e56ca 100644
--- a/Res/cordova/camera.js
+++ b/Res/cordova/camera.js
@@ -94,7 +94,7 @@ Camera.prototype.getPicture = function(successCallback, errorCallback, options)
if (typeof this.options.sourceType == "number") {
sourceType = this.options.sourceType;
}
- Cordova.exec(successCallback, errorCallback, "com.cordova.Camera", "getPicture", [quality, destinationType, sourceType]);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Camera", "getPicture", [quality, destinationType, sourceType]);
};
Cordova.addConstructor(function() {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/Res/cordova/compass.js
----------------------------------------------------------------------
diff --git a/Res/cordova/compass.js b/Res/cordova/compass.js
index a04110e..41c47ba 100644
--- a/Res/cordova/compass.js
+++ b/Res/cordova/compass.js
@@ -40,7 +40,7 @@ function Compass() {
* such as timeout.
*/
Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
- Cordova.exec(successCallback, errorCallback, "com.cordova.Compass", "getCurrentHeading", options);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Compass", "getCurrentHeading", options);
};
/**
@@ -54,7 +54,7 @@ Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, o
*/
Compass.prototype.watchHeading= function(successCallback, errorCallback, options) {
this.uuid = Cordova.createUUID();
- Cordova.exec(successCallback, errorCallback, "com.cordova.Compass", "watchHeading", [this.uuid, options.frequency || 3000]);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Compass", "watchHeading", [this.uuid, options.frequency || 3000]);
return this.uuid;
};
@@ -65,7 +65,7 @@ Compass.prototype.watchHeading= function(successCallback, errorCallback, options
*/
Compass.prototype.clearWatch = function(watchId) {
if(this.uuid == watchId) {
- Cordova.exec(null, null, "com.cordova.Compass", "clearWatch", [this.uuid]);
+ Cordova.exec(null, null, "org.apache.cordova.Compass", "clearWatch", [this.uuid]);
this.uuid = null;
} else {
debugPrint('no clear watch');
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/Res/cordova/contact.js
----------------------------------------------------------------------
diff --git a/Res/cordova/contact.js b/Res/cordova/contact.js
index a7968ec..321b084 100644
--- a/Res/cordova/contact.js
+++ b/Res/cordova/contact.js
@@ -72,7 +72,7 @@ Contact.prototype.remove = function(successCB, errorCB) {
errorCB(errorObj);
}
else {
- Cordova.exec(successCB, errorCB, "com.cordova.Contacts", "remove", [this.id]);
+ Cordova.exec(successCB, errorCB, "org.apache.cordova.Contacts", "remove", [this.id]);
}
};
/**
@@ -88,7 +88,7 @@ Contact.prototype.display = function(successCB, errorCB, options) {
errorCB(errorObj);
}
else {
- Cordova.exec(successCB, errorCB, "com.cordova.Contacts","displayContact", [this.id, options]);
+ Cordova.exec(successCB, errorCB, "org.apache.cordova.Contacts","displayContact", [this.id, options]);
}
};
@@ -147,7 +147,7 @@ Contact.prototype.clone = function() {
Contact.prototype.save = function(successCB, errorCB) {
// Read by Bada to create contact
var id = navigator.service.contacts.records.push(this) - 1;
- Cordova.exec(successCB, errorCB, "com.cordova.Contacts", "save", [id]);
+ Cordova.exec(successCB, errorCB, "org.apache.cordova.Contacts", "save", [id]);
};
/**
@@ -255,7 +255,7 @@ Contacts.prototype.find = function(fields, successCB, errorCB, options) {
/* fields searched are: displayName, Email, Phone Number, User Id
* other fields are ignored
*/
- Cordova.exec(successCB, errorCB, "com.cordova.Contacts","find",[options.filter]);
+ Cordova.exec(successCB, errorCB, "org.apache.cordova.Contacts","find",[options.filter]);
};
/**
@@ -288,11 +288,11 @@ Contacts.prototype._errCallback = function(pluginResult)
};
// Bada only api to create a new contact via the GUI
Contacts.prototype.newContactUI = function(successCallback) {
- Cordova.exec(successCallback, null, "com.cordova.Contacts","newContact", []);
+ Cordova.exec(successCallback, null, "org.apache.cordova.Contacts","newContact", []);
};
// Bada only api to select a contact via the GUI
Contacts.prototype.chooseContact = function(successCallback, options) {
- Cordova.exec(successCallback, null, "com.cordova.Contacts","chooseContact", options);
+ Cordova.exec(successCallback, null, "org.apache.cordova.Contacts","chooseContact", options);
};
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/Res/cordova/cordova.js
----------------------------------------------------------------------
diff --git a/Res/cordova/cordova.js b/Res/cordova/cordova.js
index 95125e3..81e42c3 100644
--- a/Res/cordova/cordova.js
+++ b/Res/cordova/cordova.js
@@ -622,7 +622,7 @@ Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallba
timeout = (options.timeout < 0) ? 0 : options.timeout;
}
}
- Cordova.exec(successCallback, errorCallback, "com.cordova.Geolocation", "getCurrentPosition", [maximumAge, timeout, enableHighAccuracy]);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Geolocation", "getCurrentPosition", [maximumAge, timeout, enableHighAccuracy]);
}
/**
@@ -657,7 +657,7 @@ Geolocation.prototype.watchPosition = function(successCallback, errorCallback, o
}
}
this.id = Cordova.createUUID();
- Cordova.exec(successCallback, errorCallback, "com.cordova.Geolocation", "watchPosition", [maximumAge, timeout, enableHighAccuracy]);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Geolocation", "watchPosition", [maximumAge, timeout, enableHighAccuracy]);
return this.id;
};
@@ -667,7 +667,7 @@ Geolocation.prototype.watchPosition = function(successCallback, errorCallback, o
* @param {String} id The ID of the watch returned from #watchPosition
*/
Geolocation.prototype.clearWatch = function(id) {
- Cordova.exec(null, null, "com.cordova.Geolocation", "stop", []);
+ Cordova.exec(null, null, "org.apache.cordova.Geolocation", "stop", []);
this.id = null;
};
@@ -810,7 +810,7 @@ Accelerometer.prototype.getCurrentAcceleration = function(successCallback, error
}
// Get acceleration
- Cordova.exec(successCallback, errorCallback, "com.cordova.Accelerometer", "getCurrentAcceleration", []);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Accelerometer", "getCurrentAcceleration", []);
};
/**
@@ -839,7 +839,7 @@ Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallb
}
// Start watch timer
this.id = Cordova.createUUID();
- Cordova.exec(successCallback, errorCallback, "com.cordova.Accelerometer", "watchAcceleration", []);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Accelerometer", "watchAcceleration", []);
return this.id;
};
@@ -852,7 +852,7 @@ Accelerometer.prototype.clearWatch = function(id) {
// Stop javascript timer & remove from timer list
if (id == this.id) {
- Cordova.exec(null, null, "com.cordova.Accelerometer", "clearWatch", []);
+ Cordova.exec(null, null, "org.apache.cordova.Accelerometer", "clearWatch", []);
}
};
@@ -921,7 +921,7 @@ Network.prototype.isReachable = function(uri, callback, options) {
if (options && options.isIpAddress) {
isIpAddress = options.isIpAddress;
}
- Cordova.exec(callback, null, 'com.cordova.Network', 'isReachable', [uri, isIpAddress]);
+ Cordova.exec(callback, null, 'org.apache.cordova.Network', 'isReachable', [uri, isIpAddress]);
};
/**
@@ -1004,7 +1004,7 @@ DebugConsole.prototype.processMessage = function(message, maxDepth) {
*/
DebugConsole.prototype.log = function(message, maxDepth) {
if (Cordova.available && this.logLevel <= DebugConsole.INFO_LEVEL)
- Cordova.exec(null, null, 'com.cordova.DebugConsole', 'log',
+ Cordova.exec(null, null, 'org.apache.cordova.DebugConsole', 'log',
[this.processMessage(message, maxDepth), 'INFO']
);
else
@@ -1017,7 +1017,7 @@ DebugConsole.prototype.log = function(message, maxDepth) {
*/
DebugConsole.prototype.warn = function(message, maxDepth) {
if (Cordova.available && this.logLevel <= DebugConsole.WARN_LEVEL)
- Cordova.exec(null, null, 'com.cordova.DebugConsole', 'log',
+ Cordova.exec(null, null, 'org.apache.cordova.DebugConsole', 'log',
[this.processMessage(message, maxDepth), 'WARN']
);
else
@@ -1030,7 +1030,7 @@ DebugConsole.prototype.warn = function(message, maxDepth) {
*/
DebugConsole.prototype.error = function(message, maxDepth) {
if (Cordova.available && this.logLevel <= DebugConsole.ERROR_LEVEL)
- Cordova.exec(null, null, 'com.cordova.DebugConsole', 'log',
+ Cordova.exec(null, null, 'org.apache.cordova.DebugConsole', 'log',
[this.processMessage(message, maxDepth), 'ERROR']
);
else
@@ -1102,7 +1102,7 @@ Contact.prototype.remove = function(successCB, errorCB) {
errorCB(errorObj);
}
else {
- Cordova.exec(successCB, errorCB, "com.cordova.Contacts", "remove", [this.id]);
+ Cordova.exec(successCB, errorCB, "org.apache.cordova.Contacts", "remove", [this.id]);
}
};
/**
@@ -1118,7 +1118,7 @@ Contact.prototype.display = function(successCB, errorCB, options) {
errorCB(errorObj);
}
else {
- Cordova.exec(successCB, errorCB, "com.cordova.Contacts","displayContact", [this.id, options]);
+ Cordova.exec(successCB, errorCB, "org.apache.cordova.Contacts","displayContact", [this.id, options]);
}
};
@@ -1177,7 +1177,7 @@ Contact.prototype.clone = function() {
Contact.prototype.save = function(successCB, errorCB) {
// Read by Bada to create contact
var id = navigator.service.contacts.records.push(this) - 1;
- Cordova.exec(successCB, errorCB, "com.cordova.Contacts", "save", [id]);
+ Cordova.exec(successCB, errorCB, "org.apache.cordova.Contacts", "save", [id]);
};
/**
@@ -1285,7 +1285,7 @@ Contacts.prototype.find = function(fields, successCB, errorCB, options) {
/* fields searched are: displayName, Email, Phone Number, User Id
* other fields are ignored
*/
- Cordova.exec(successCB, errorCB, "com.cordova.Contacts","find",[options.filter]);
+ Cordova.exec(successCB, errorCB, "org.apache.cordova.Contacts","find",[options.filter]);
};
/**
@@ -1318,11 +1318,11 @@ Contacts.prototype._errCallback = function(pluginResult)
};
// Bada only api to create a new contact via the GUI
Contacts.prototype.newContactUI = function(successCallback) {
- Cordova.exec(successCallback, null, "com.cordova.Contacts","newContact", []);
+ Cordova.exec(successCallback, null, "org.apache.cordova.Contacts","newContact", []);
};
// Bada only api to select a contact via the GUI
Contacts.prototype.chooseContact = function(successCallback, options) {
- Cordova.exec(successCallback, null, "com.cordova.Contacts","chooseContact", options);
+ Cordova.exec(successCallback, null, "org.apache.cordova.Contacts","chooseContact", options);
};
@@ -1429,7 +1429,7 @@ function Compass() {
* such as timeout.
*/
Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
- Cordova.exec(successCallback, errorCallback, "com.cordova.Compass", "getCurrentHeading", options);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Compass", "getCurrentHeading", options);
};
/**
@@ -1443,7 +1443,7 @@ Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, o
*/
Compass.prototype.watchHeading= function(successCallback, errorCallback, options) {
this.uuid = Cordova.createUUID();
- Cordova.exec(successCallback, errorCallback, "com.cordova.Compass", "watchHeading", [this.uuid, options.frequency || 3000]);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Compass", "watchHeading", [this.uuid, options.frequency || 3000]);
return this.uuid;
};
@@ -1454,7 +1454,7 @@ Compass.prototype.watchHeading= function(successCallback, errorCallback, options
*/
Compass.prototype.clearWatch = function(watchId) {
if(this.uuid == watchId) {
- Cordova.exec(null, null, "com.cordova.Compass", "clearWatch", [this.uuid]);
+ Cordova.exec(null, null, "org.apache.cordova.Compass", "clearWatch", [this.uuid]);
this.uuid = null;
} else {
debugPrint('no clear watch');
@@ -1533,7 +1533,7 @@ labelsToBoxStyle = function(buttonLabels) {
Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
var _title = (title || "Alert");
this.messageBox = new MessageBox(_title, message, labelsToBoxStyle(buttonLabel));
- Cordova.exec(completeCallback, null, 'com.cordova.Notification', 'alert', []);
+ Cordova.exec(completeCallback, null, 'org.apache.cordova.Notification', 'alert', []);
};
/**
@@ -1547,7 +1547,7 @@ Notification.prototype.confirm = function(message, resultCallback, title, button
var _title = (title || "Confirm");
var _buttonLabels = (buttonLabels || "OK,Cancel");
this.messageBox = new MessageBox(_title, message, labelsToBoxStyle(buttonLabels));
- return Cordova.exec(resultCallback, null, 'com.cordova.Notification', 'confirm', []);
+ return Cordova.exec(resultCallback, null, 'org.apache.cordova.Notification', 'confirm', []);
};
/**
@@ -1555,7 +1555,7 @@ Notification.prototype.confirm = function(message, resultCallback, title, button
* @param {Integer} mills The number of milliseconds to vibrate for.
*/
Notification.prototype.vibrate = function(mills) {
- Cordova.exec(null, null, 'com.cordova.Notification', 'vibrate', [mills]);
+ Cordova.exec(null, null, 'org.apache.cordova.Notification', 'vibrate', [mills]);
};
/**
@@ -1563,7 +1563,7 @@ Notification.prototype.vibrate = function(mills) {
* @param {Integer} count The number of beeps.
*/
Notification.prototype.beep = function(count) {
- Cordova.exec(null, null, 'com.cordova.Notification', 'beep', [count]);
+ Cordova.exec(null, null, 'org.apache.cordova.Notification', 'beep', [count]);
};
Cordova.addConstructor(function() {
@@ -1653,7 +1653,7 @@ Camera.prototype.getPicture = function(successCallback, errorCallback, options)
if (typeof this.options.sourceType == "number") {
sourceType = this.options.sourceType;
}
- Cordova.exec(successCallback, errorCallback, "com.cordova.Camera", "getPicture", [quality, destinationType, sourceType]);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Camera", "getPicture", [quality, destinationType, sourceType]);
};
Cordova.addConstructor(function() {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/Res/cordova/debugconsole.js
----------------------------------------------------------------------
diff --git a/Res/cordova/debugconsole.js b/Res/cordova/debugconsole.js
index 7f1139f..e6cc811 100644
--- a/Res/cordova/debugconsole.js
+++ b/Res/cordova/debugconsole.js
@@ -87,7 +87,7 @@ DebugConsole.prototype.processMessage = function(message, maxDepth) {
*/
DebugConsole.prototype.log = function(message, maxDepth) {
if (Cordova.available && this.logLevel <= DebugConsole.INFO_LEVEL)
- Cordova.exec(null, null, 'com.cordova.DebugConsole', 'log',
+ Cordova.exec(null, null, 'org.apache.cordova.DebugConsole', 'log',
[this.processMessage(message, maxDepth), 'INFO']
);
else
@@ -100,7 +100,7 @@ DebugConsole.prototype.log = function(message, maxDepth) {
*/
DebugConsole.prototype.warn = function(message, maxDepth) {
if (Cordova.available && this.logLevel <= DebugConsole.WARN_LEVEL)
- Cordova.exec(null, null, 'com.cordova.DebugConsole', 'log',
+ Cordova.exec(null, null, 'org.apache.cordova.DebugConsole', 'log',
[this.processMessage(message, maxDepth), 'WARN']
);
else
@@ -113,7 +113,7 @@ DebugConsole.prototype.warn = function(message, maxDepth) {
*/
DebugConsole.prototype.error = function(message, maxDepth) {
if (Cordova.available && this.logLevel <= DebugConsole.ERROR_LEVEL)
- Cordova.exec(null, null, 'com.cordova.DebugConsole', 'log',
+ Cordova.exec(null, null, 'org.apache.cordova.DebugConsole', 'log',
[this.processMessage(message, maxDepth), 'ERROR']
);
else
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/Res/cordova/geolocation.js
----------------------------------------------------------------------
diff --git a/Res/cordova/geolocation.js b/Res/cordova/geolocation.js
index 927d8a3..54ed215 100644
--- a/Res/cordova/geolocation.js
+++ b/Res/cordova/geolocation.js
@@ -73,7 +73,7 @@ Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallba
timeout = (options.timeout < 0) ? 0 : options.timeout;
}
}
- Cordova.exec(successCallback, errorCallback, "com.cordova.Geolocation", "getCurrentPosition", [maximumAge, timeout, enableHighAccuracy]);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Geolocation", "getCurrentPosition", [maximumAge, timeout, enableHighAccuracy]);
}
/**
@@ -108,7 +108,7 @@ Geolocation.prototype.watchPosition = function(successCallback, errorCallback, o
}
}
this.id = Cordova.createUUID();
- Cordova.exec(successCallback, errorCallback, "com.cordova.Geolocation", "watchPosition", [maximumAge, timeout, enableHighAccuracy]);
+ Cordova.exec(successCallback, errorCallback, "org.apache.cordova.Geolocation", "watchPosition", [maximumAge, timeout, enableHighAccuracy]);
return this.id;
};
@@ -118,7 +118,7 @@ Geolocation.prototype.watchPosition = function(successCallback, errorCallback, o
* @param {String} id The ID of the watch returned from #watchPosition
*/
Geolocation.prototype.clearWatch = function(id) {
- Cordova.exec(null, null, "com.cordova.Geolocation", "stop", []);
+ Cordova.exec(null, null, "org.apache.cordova.Geolocation", "stop", []);
this.id = null;
};
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/Res/cordova/network.js
----------------------------------------------------------------------
diff --git a/Res/cordova/network.js b/Res/cordova/network.js
index 19a7671..d5b3b17 100644
--- a/Res/cordova/network.js
+++ b/Res/cordova/network.js
@@ -53,7 +53,7 @@ Network.prototype.isReachable = function(uri, callback, options) {
if (options && options.isIpAddress) {
isIpAddress = options.isIpAddress;
}
- Cordova.exec(callback, null, 'com.cordova.Network', 'isReachable', [uri, isIpAddress]);
+ Cordova.exec(callback, null, 'org.apache.cordova.Network', 'isReachable', [uri, isIpAddress]);
};
/**
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/Res/cordova/notification.js
----------------------------------------------------------------------
diff --git a/Res/cordova/notification.js b/Res/cordova/notification.js
index 6c07808..d3c480f 100644
--- a/Res/cordova/notification.js
+++ b/Res/cordova/notification.js
@@ -79,7 +79,7 @@ labelsToBoxStyle = function(buttonLabels) {
Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
var _title = (title || "Alert");
this.messageBox = new MessageBox(_title, message, labelsToBoxStyle(buttonLabel));
- Cordova.exec(completeCallback, null, 'com.cordova.Notification', 'alert', []);
+ Cordova.exec(completeCallback, null, 'org.apache.cordova.Notification', 'alert', []);
};
/**
@@ -93,7 +93,7 @@ Notification.prototype.confirm = function(message, resultCallback, title, button
var _title = (title || "Confirm");
var _buttonLabels = (buttonLabels || "OK,Cancel");
this.messageBox = new MessageBox(_title, message, labelsToBoxStyle(buttonLabels));
- return Cordova.exec(resultCallback, null, 'com.cordova.Notification', 'confirm', []);
+ return Cordova.exec(resultCallback, null, 'org.apache.cordova.Notification', 'confirm', []);
};
/**
@@ -101,7 +101,7 @@ Notification.prototype.confirm = function(message, resultCallback, title, button
* @param {Integer} mills The number of milliseconds to vibrate for.
*/
Notification.prototype.vibrate = function(mills) {
- Cordova.exec(null, null, 'com.cordova.Notification', 'vibrate', [mills]);
+ Cordova.exec(null, null, 'org.apache.cordova.Notification', 'vibrate', [mills]);
};
/**
@@ -109,7 +109,7 @@ Notification.prototype.vibrate = function(mills) {
* @param {Integer} count The number of beeps.
*/
Notification.prototype.beep = function(count) {
- Cordova.exec(null, null, 'com.cordova.Notification', 'beep', [count]);
+ Cordova.exec(null, null, 'org.apache.cordova.Notification', 'beep', [count]);
};
Cordova.addConstructor(function() {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/src/Accelerometer.cpp
----------------------------------------------------------------------
diff --git a/src/Accelerometer.cpp b/src/Accelerometer.cpp
index fbf5166..2f54d98 100755
--- a/src/Accelerometer.cpp
+++ b/src/Accelerometer.cpp
@@ -50,13 +50,13 @@ Accelerometer::Run(const String& command) {
strTok.GetNextToken(callbackId);
AppLogDebug("Method %S, CallbackId: %S", method.GetPointer(), callbackId.GetPointer());
}
- if(method == L"com.cordova.Accelerometer.watchAcceleration" && !callbackId.IsEmpty() && !IsStarted()) {
+ if(method == L"org.apache.cordova.Accelerometer.watchAcceleration" && !callbackId.IsEmpty() && !IsStarted()) {
StartSensor();
}
- if(method == L"com.cordova.Accelerometer.clearWatch" && IsStarted()) {
+ if(method == L"org.apache.cordova.Accelerometer.clearWatch" && IsStarted()) {
StopSensor();
}
- if(method == L"com.cordova.Accelerometer.getCurrentAcceleration" && !callbackId.IsEmpty() && !IsStarted()) {
+ if(method == L"org.apache.cordova.Accelerometer.getCurrentAcceleration" && !callbackId.IsEmpty() && !IsStarted()) {
GetLastAcceleration();
}
AppLogDebug("Acceleration command %S completed", command.GetPointer());
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/src/Compass.cpp
----------------------------------------------------------------------
diff --git a/src/Compass.cpp b/src/Compass.cpp
index d0f7260..ab334cd 100755
--- a/src/Compass.cpp
+++ b/src/Compass.cpp
@@ -51,15 +51,15 @@ Compass::Run(const String& command) {
strTok.GetNextToken(callbackId);
AppLogDebug("Method %S, callbackId: %S", method.GetPointer(), callbackId.GetPointer());
// used to determine callback ID
- if(method == L"com.cordova.Compass.watchHeading" && !callbackId.IsEmpty() && !IsStarted()) {
+ if(method == L"org.apache.cordova.Compass.watchHeading" && !callbackId.IsEmpty() && !IsStarted()) {
AppLogDebug("watching compass...");
StartSensor();
}
- if(method == L"com.cordova.Compass.clearWatch" && !callbackId.IsEmpty() && IsStarted()) {
+ if(method == L"org.apache.cordova.Compass.clearWatch" && !callbackId.IsEmpty() && IsStarted()) {
AppLogDebug("stop watching compass...");
StopSensor();
}
- if(method == L"com.cordova.Compass.getCurrentHeading" && !callbackId.IsEmpty() && !IsStarted()) {
+ if(method == L"org.apache.cordova.Compass.getCurrentHeading" && !callbackId.IsEmpty() && !IsStarted()) {
AppLogDebug("getting current compass...");
GetLastHeading();
}
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/src/Contacts.cpp
----------------------------------------------------------------------
diff --git a/src/Contacts.cpp b/src/Contacts.cpp
index 1a439d9..7a24f32 100755
--- a/src/Contacts.cpp
+++ b/src/Contacts.cpp
@@ -43,7 +43,7 @@ Contacts::Run(const String& command) {
}
strTok.GetNextToken(callbackId);
// Saving a new contact
- if(method == L"com.cordova.Contacts.save" && !callbackId.IsEmpty()) {
+ if(method == L"org.apache.cordova.Contacts.save" && !callbackId.IsEmpty()) {
String contactId;
strTok.GetNextToken(contactId);
int cid = -1;
@@ -55,12 +55,12 @@ Contacts::Run(const String& command) {
AppLogDebug("Method %S callbackId %S contactId %d", method.GetPointer(), callbackId.GetPointer(), cid);
Create(cid);
// Finding an exisiting contact by Name/Phone Number/Email
- } else if(method == L"com.cordova.Contacts.find" && !callbackId.IsEmpty()) {
+ } else if(method == L"org.apache.cordova.Contacts.find" && !callbackId.IsEmpty()) {
String filter;
strTok.GetNextToken(filter);
AppLogDebug("Method %S callbackId %S filter %S", method.GetPointer(), callbackId.GetPointer(), filter.GetPointer());
Find(filter);
- } else if(method == L"com.cordova.Contacts.remove" && !callbackId.IsEmpty()) {
+ } else if(method == L"org.apache.cordova.Contacts.remove" && !callbackId.IsEmpty()) {
String id;
strTok.GetNextToken(id);
AppLogDebug("Method %S callbackId %S ID to remove %S", method.GetPointer(), callbackId.GetPointer(), id.GetPointer());
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/src/DebugConsole.cpp
----------------------------------------------------------------------
diff --git a/src/DebugConsole.cpp b/src/DebugConsole.cpp
index 74f744a..10d9f8e 100755
--- a/src/DebugConsole.cpp
+++ b/src/DebugConsole.cpp
@@ -59,7 +59,7 @@ DebugConsole::Run(const String& command) {
CleanUp(statement);
strTok.GetNextToken(logLevel);
//AppLogDebug("method %S statement %S loglevel %S", method.GetPointer(), statement.GetPointer(), logLevel.GetPointer());
- if(method == L"com.cordova.DebugConsole.log") {
+ if(method == L"org.apache.cordova.DebugConsole.log") {
Log(statement, logLevel);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/src/GeoLocation.cpp
----------------------------------------------------------------------
diff --git a/src/GeoLocation.cpp b/src/GeoLocation.cpp
index 27d2f2d..0c854d8 100755
--- a/src/GeoLocation.cpp
+++ b/src/GeoLocation.cpp
@@ -52,15 +52,15 @@ GeoLocation::Run(const String& command) {
}
AppLogDebug("Method %S, Callback: %S", method.GetPointer(), callbackId.GetPointer());
// used to determine callback ID
- if(method == L"com.cordova.Geolocation.watchPosition" && !callbackId.IsEmpty() && !IsWatching()) {
+ if(method == L"org.apache.cordova.Geolocation.watchPosition" && !callbackId.IsEmpty() && !IsWatching()) {
AppLogDebug("watching position...");
StartWatching();
}
- if(method == L"com.cordova.Geolocation.stop" && IsWatching()) {
+ if(method == L"org.apache.cordova.Geolocation.stop" && IsWatching()) {
AppLogDebug("stop watching position...");
StopWatching();
}
- if(method == L"com.cordova.Geolocation.getCurrentPosition" && !callbackId.IsEmpty() && !IsWatching()) {
+ if(method == L"org.apache.cordova.Geolocation.getCurrentPosition" && !callbackId.IsEmpty() && !IsWatching()) {
AppLogDebug("getting current position...");
GetLastKnownLocation();
}
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/src/Kamera.cpp
----------------------------------------------------------------------
diff --git a/src/Kamera.cpp b/src/Kamera.cpp
index d92d3f9..f2a84c9 100755
--- a/src/Kamera.cpp
+++ b/src/Kamera.cpp
@@ -42,7 +42,7 @@ Kamera::Run(const String& command) {
return;
}
strTok.GetNextToken(callbackId);
- if(method == "com.cordova.Camera.getPicture" && !callbackId.IsEmpty()) {
+ if(method == "org.apache.cordova.Camera.getPicture" && !callbackId.IsEmpty()) {
GetPicture();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/src/Network.cpp
----------------------------------------------------------------------
diff --git a/src/Network.cpp b/src/Network.cpp
index 999cb84..5674d1d 100755
--- a/src/Network.cpp
+++ b/src/Network.cpp
@@ -52,7 +52,7 @@ Network::Run(const String& command) {
Uri uri;
uri.SetUri(hostAddr);
AppLogDebug("Method %S, callbackId %S, hostAddr %S URI %S", method.GetPointer(), callbackId.GetPointer(), hostAddr.GetPointer(), uri.ToString().GetPointer());
- if(method == L"com.cordova.Network.isReachable") {
+ if(method == L"org.apache.cordova.Network.isReachable") {
IsReachable(uri.ToString());
}
AppLogDebug("Network command %S completed", command.GetPointer());
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/src/Notification.cpp
----------------------------------------------------------------------
diff --git a/src/Notification.cpp b/src/Notification.cpp
index afb384b..3c44294 100755
--- a/src/Notification.cpp
+++ b/src/Notification.cpp
@@ -41,13 +41,13 @@ Notification::Run(const String& command) {
AppLogException("Not enough params");
return;
}
- if((method == L"com.cordova.Notification.alert" || method == L"com.cordova.Notification.confirm")) {
+ if((method == L"org.apache.cordova.Notification.alert" || method == L"org.apache.cordova.Notification.confirm")) {
strTok.GetNextToken(callbackId);
AppLogDebug("%S %S", method.GetPointer(), callbackId.GetPointer());
if(!callbackId.IsEmpty()) {
Dialog();
}
- } else if(method == L"com.cordova.Notification.vibrate") {
+ } else if(method == L"org.apache.cordova.Notification.vibrate") {
long duration;
String durationStr;
@@ -60,7 +60,7 @@ Notification::Run(const String& command) {
return;
}
Vibrate(duration);
- } else if(method == L"com.cordova.Notification.beep") {
+ } else if(method == L"org.apache.cordova.Notification.beep") {
int count;
String countStr;
http://git-wip-us.apache.org/repos/asf/incubator-cordova-bada/blob/03adecf5/src/WebForm.cpp
----------------------------------------------------------------------
diff --git a/src/WebForm.cpp b/src/WebForm.cpp
index 9d43490..57b1373 100755
--- a/src/WebForm.cpp
+++ b/src/WebForm.cpp
@@ -151,28 +151,28 @@ WebForm::OnLoadingCompleted() {
// Analyzing Cordova command
if(__cordovaCommand) {
- if(__cordovaCommand->StartsWith(L"gap://com.cordova.Geolocation", 0)) {
+ if(__cordovaCommand->StartsWith(L"gap://org.apache.cordova.Geolocation", 0)) {
geolocation->Run(*__cordovaCommand);
}
- else if(__cordovaCommand->StartsWith(L"gap://com.cordova.Accelerometer", 0)) {
+ else if(__cordovaCommand->StartsWith(L"gap://org.apache.cordova.Accelerometer", 0)) {
accel->Run(*__cordovaCommand);
}
- else if(__cordovaCommand->StartsWith(L"gap://com.cordova.Network", 0)) {
+ else if(__cordovaCommand->StartsWith(L"gap://org.apache.cordova.Network", 0)) {
network->Run(*__cordovaCommand);
}
- else if(__cordovaCommand->StartsWith(L"gap://com.cordova.DebugConsole", 0)) {
+ else if(__cordovaCommand->StartsWith(L"gap://org.apache.cordova.DebugConsole", 0)) {
console->Run(*__cordovaCommand);
}
- else if(__cordovaCommand->StartsWith(L"gap://com.cordova.Compass", 0)) {
+ else if(__cordovaCommand->StartsWith(L"gap://org.apache.cordova.Compass", 0)) {
compass->Run(*__cordovaCommand);
}
- else if(__cordovaCommand->StartsWith(L"gap://com.cordova.Contacts", 0)) {
+ else if(__cordovaCommand->StartsWith(L"gap://org.apache.cordova.Contacts", 0)) {
contacts->Run(*__cordovaCommand);
}
- else if(__cordovaCommand->StartsWith(L"gap://com.cordova.Notification", 0)) {
+ else if(__cordovaCommand->StartsWith(L"gap://org.apache.cordova.Notification", 0)) {
notification->Run(*__cordovaCommand);
}
- else if(__cordovaCommand->StartsWith(L"gap://com.cordova.Camera", 0)) {
+ else if(__cordovaCommand->StartsWith(L"gap://org.apache.cordova.Camera", 0)) {
camera->Run(*__cordovaCommand);
}
// Tell the JS code that we got this command, and we're ready for another