Skip to content

Commit

Permalink
[CB-3563] Update references to DroidGap in code comments
Browse files Browse the repository at this point in the history
  • Loading branch information
clelland committed May 31, 2013
1 parent fb89cef commit c509c8e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions framework/src/org/apache/cordova/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one
import java.util.HashMap;

/**
* This class exposes methods in DroidGap that can be called from JavaScript.
* This class exposes methods in Cordova that can be called from JavaScript.
*/
public class App extends CordovaPlugin {

Expand Down Expand Up @@ -104,7 +104,7 @@ public void clearCache() {
* Load the url into the webview.
*
* @param url
* @param props Properties that can be passed in to the DroidGap activity (i.e. loadingDialog, wait, ...)
* @param props Properties that can be passed in to the Cordova activity (i.e. loadingDialog, wait, ...)
* @throws JSONException
*/
public void loadUrl(String url, JSONObject props) throws JSONException {
Expand Down
6 changes: 3 additions & 3 deletions framework/src/org/apache/cordova/CordovaActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Licensed to the Apache Software Foundation (ASF) under one
* Cordova.xml configuration:
* Cordova uses a configuration file at res/xml/cordova.xml to specify the following settings.
*
* Approved list of URLs that can be loaded into DroidGap
* Approved list of URLs that can be loaded into Cordova
* <access origin="http://server regexp" subdomains="true" />
* Log level: ERROR, WARN, INFO, DEBUG, VERBOSE (default=ERROR)
* <log level="DEBUG" />
Expand Down Expand Up @@ -952,7 +952,7 @@ public boolean isUrlWhiteListed(String url) {
}

/*
* Hook in DroidGap for menu plugins
* Hook in Cordova for menu plugins
*
*/
@Override
Expand Down Expand Up @@ -991,7 +991,7 @@ public Context getContext() {
* @param url The url to load.
* @param openExternal Load url in browser instead of Cordova webview.
* @param clearHistory Clear the history stack, so new page becomes top of history
* @param params DroidGap parameters for new app
* @param params Parameters for new app
*/
public void showWebPage(String url, boolean openExternal, boolean clearHistory, HashMap<String, Object> params) {
if (this.appView != null) {
Expand Down
4 changes: 2 additions & 2 deletions framework/src/org/apache/cordova/CordovaWebView.java
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ public boolean backHistory() {
* @param url The url to load.
* @param openExternal Load url in browser instead of Cordova webview.
* @param clearHistory Clear the history stack, so new page becomes top of history
* @param params DroidGap parameters for new app
* @param params Parameters for new app
*/
public void showWebPage(String url, boolean openExternal, boolean clearHistory, HashMap<String, Object> params) {
LOG.d(TAG, "showWebPage(%s, %b, %b, HashMap", url, openExternal, clearHistory);
Expand Down Expand Up @@ -601,7 +601,7 @@ public void showWebPage(String url, boolean openExternal, boolean clearHistory,

/**
* Check configuration parameters from Config.
* Approved list of URLs that can be loaded into DroidGap
* Approved list of URLs that can be loaded into Cordova
* <access origin="http://server regexp" subdomains="true" />
* Log level: ERROR, WARN, INFO, DEBUG, VERBOSE (default=ERROR)
* <log level="DEBUG" />
Expand Down
2 changes: 1 addition & 1 deletion framework/src/org/apache/cordova/Device.java
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public void onDestroy() {
/**
* Listen for telephony events: RINGING, OFFHOOK and IDLE
* Send these events to all plugins using
* DroidGap.onMessage("telephone", "ringing" | "offhook" | "idle")
* CordovaActivity.onMessage("telephone", "ringing" | "offhook" | "idle")
*/
private void initTelephonyReceiver() {
IntentFilter intentFilter = new IntentFilter();
Expand Down

0 comments on commit c509c8e

Please sign in to comment.