github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-26 12:03:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update PluginManager to not call Class.forName twice

Browse Source
This commit is contained in:
Dave Johnson 2010-10-05 10:08:48 +01:00 committed by Bryce Curtis
parent 385be26046
commit 7d6ffc676d
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
framework/src/com/phonegap/api/PluginManager.java
View File

@ -68,11 +68,11 @@ public final class PluginManager {
if (clazz != null) { if (clazz != null) {
c = getClassByName(clazz); c = getClassByName(clazz);
} }
if ((c == null) || isPhoneGapPlugin(c)) { if (isPhoneGapPlugin(c)) {
final Plugin plugin = this.addPlugin(clazz); final Plugin plugin = this.addPlugin(clazz, c, callbackId);
final DroidGap ctx = this.ctx; final DroidGap ctx = this.ctx;
runAsync = async && !plugin.isSynch(action); runAsync = async && !plugin.isSynch(action);
if (async && !plugin.isSynch(action)) { if (runAsync) {
// Run this on a different thread so that this one can return back to JS // Run this on a different thread so that this one can return back to JS
Thread thread = new Thread(new Runnable() { Thread thread = new Thread(new Runnable() {
public void run() { public void run() {
@ -131,18 +131,31 @@ public final class PluginManager {
* @return Boolean indicating if the class implements com.phonegap.api.Plugin * @return Boolean indicating if the class implements com.phonegap.api.Plugin
*/ */
private boolean isPhoneGapPlugin(Class c) { private boolean isPhoneGapPlugin(Class c) {
if (c.getSuperclass().getName().equals("com.phonegap.api.Plugin")) { if (c != null) {
return true; if (c.getSuperclass().getName().equals("com.phonegap.api.Plugin")) {
}
Class[] interfaces = c.getInterfaces();
for (int j=0; j<interfaces.length; j++) {
if (interfaces[j].getName().equals("com.phonegap.api.IPlugin")) {
return true; return true;
} }
Class[] interfaces = c.getInterfaces();
for (int j=0; j<interfaces.length; j++) {
if (interfaces[j].getName().equals("com.phonegap.api.IPlugin")) {
return true;
}
}
} }
return false; return false;
} }
public Plugin addPlugin(String className) {
try {
return this.addPlugin(className, this.getClassByName(className), "");
} catch (ClassNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
System.out.println("Error adding plugin "+className+".");
}
return null;
}
/** /**
* Add plugin to be loaded and cached. * Add plugin to be loaded and cached.
* If plugin is already created, then just return it. * If plugin is already created, then just return it.
@ -150,16 +163,17 @@ public final class PluginManager {
* @param className The class to load * @param className The class to load
* @return The plugin * @return The plugin
*/ */
public Plugin addPlugin(String className) { public Plugin addPlugin(String className, Class clazz, String callbackId) {
if (this.plugins.containsKey(className)) { if (this.plugins.containsKey(className)) {
return this.getPlugin(className); return this.getPlugin(className);
} }
System.out.println("PluginManager.addPlugin("+className+")"); System.out.println("PluginManager.addPlugin("+className+")");
try { try {
Plugin plugin = (Plugin)Class.forName(className).newInstance(); Plugin plugin = (Plugin)clazz.newInstance();
this.plugins.put(className, plugin); this.plugins.put(className, plugin);
plugin.setContext((DroidGap)this.ctx); plugin.setContext((DroidGap)this.ctx);
plugin.setView(this.app); plugin.setView(this.app);
//plugin.setCallbackId(callbackId);
return plugin; return plugin;
} }
catch (Exception e) { catch (Exception e) {
@ -175,7 +189,7 @@ public final class PluginManager {
* @param className The class of the loaded plugin. * @param className The class of the loaded plugin.
* @return * @return
*/ */
public Plugin getPlugin(String className) { private Plugin getPlugin(String className) {
Plugin plugin = this.plugins.get(className); Plugin plugin = this.plugins.get(className);
return plugin; return plugin;
} }
@ -196,7 +210,7 @@ public final class PluginManager {
* @param serviceType * @param serviceType
* @return * @return
*/ */
public String getClassForService(String serviceType) { private String getClassForService(String serviceType) {
return this.services.get(serviceType); return this.services.get(serviceType);
} }