rename getPluginContex to getDefaultPluginContext

limpoxe · limpoxe · commit 350f1af68957 · 2015-05-14T11:10:22.000+08:00
Signed-off-by: Cai Liming &lt;405977146@163.com&gt;
diff --git a/PluginCore/src/com/plugin/core/PluginLoader.java b/PluginCore/src/com/plugin/core/PluginLoader.java
@@ -163,7 +163,7 @@ public static Class loadPluginClassById(String clazzId) {
 	 * @param clazz
 	 * @return
 	 */
-	public static Context getPluginContext(@SuppressWarnings("rawtypes") Class clazz) {
+	public static Context getDefaultPluginContext(@SuppressWarnings("rawtypes") Class clazz) {
 
 		// clazz.getClassLoader(); 直接获取classloader的方式，
 		// 如果同一个插件安装两次，但是宿主程序进程没有重启，那么得到的classloader可能是前次安装时的loader
@@ -185,7 +185,7 @@ public static Context getPluginContext(@SuppressWarnings("rawtypes") Class clazz
 	
 	public static Context getNewPluginContext(@SuppressWarnings("rawtypes") Class clazz) {
 
-		Context pluginContext = getPluginContext(clazz);
+		Context pluginContext = getDefaultPluginContext(clazz);
 
 		if (pluginContext != null) {
 			pluginContext = PluginCreator.createPluginApplicationContext(sApplication,
diff --git a/PluginCore/src/com/plugin/core/ui/PluginProxyActivity.java b/PluginCore/src/com/plugin/core/ui/PluginProxyActivity.java
@@ -63,7 +63,7 @@ private Context findPluginContext() {
 		@SuppressWarnings("rawtypes")
 		Class clazz = PluginLoader.loadPluginClassById(classId);
 		if (clazz != null) {
-			return PluginLoader.getPluginContext(clazz);
+			return PluginLoader.getDefaultPluginContext(clazz);
 		}
 		return null;
 	}
diff --git a/PluginCore/src/com/plugin/core/ui/PluginSpecDisplayer.java b/PluginCore/src/com/plugin/core/ui/PluginSpecDisplayer.java
@@ -34,7 +34,7 @@ private Context findPluginContext() {
 		Class clazz = PluginLoader.loadPluginClassById(classId);
 
 		if (clazz != null) {
-			return PluginLoader.getPluginContext(clazz);
+			return PluginLoader.getDefaultPluginContext(clazz);
 		}
 		return null;
 	}
diff --git a/PluginTest/src/com/example/plugintest/activity/PluginNotInManifestActivity.java b/PluginTest/src/com/example/plugintest/activity/PluginNotInManifestActivity.java
@@ -94,6 +94,6 @@ public void onClick(View v) {
 	
 	@Override
 	protected void attachBaseContext(Context newBase) {
-		super.attachBaseContext(PluginLoader.getPluginContext(PluginNotInManifestActivity.class));
+		super.attachBaseContext(PluginLoader.getDefaultPluginContext(PluginNotInManifestActivity.class));
 	}
 }
diff --git a/PluginTest/src/com/example/plugintest/fragment/PluginSpecFragment.java b/PluginTest/src/com/example/plugintest/fragment/PluginSpecFragment.java
@@ -40,7 +40,7 @@ public void onCreate(Bundle savedInstanceState) {
 
 		getActivity().setTitle("测试插件自由模式的Fragment");
 
-		pluginContext = PluginLoader.getPluginContext(PluginSpecFragment.class);
+		pluginContext = PluginLoader.getDefaultPluginContext(PluginSpecFragment.class);
 
 		// 设置主题为宿主程序主题
 		// pluginContext.setTheme(getActivity().getApplicationInfo().theme);

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ private Context findPluginContext() {`
`63`	`63`	`@SuppressWarnings("rawtypes")`
`64`	`64`	`Class clazz = PluginLoader.loadPluginClassById(classId);`
`65`	`65`	`if (clazz != null) {`
`66`		`- return PluginLoader.getPluginContext(clazz);`
	`66`	`+ return PluginLoader.getDefaultPluginContext(clazz);`
`67`	`67`	`}`
`68`	`68`	`return null;`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ private Context findPluginContext() {`
`34`	`34`	`Class clazz = PluginLoader.loadPluginClassById(classId);`
`35`	`35`
`36`	`36`	`if (clazz != null) {`
`37`		`- return PluginLoader.getPluginContext(clazz);`
	`37`	`+ return PluginLoader.getDefaultPluginContext(clazz);`
`38`	`38`	`}`
`39`	`39`	`return null;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,6 @@ public void onClick(View v) {`
`94`	`94`
`95`	`95`	`@Override`
`96`	`96`	`protected void attachBaseContext(Context newBase) {`
`97`		`- super.attachBaseContext(PluginLoader.getPluginContext(PluginNotInManifestActivity.class));`
	`97`	`+ super.attachBaseContext(PluginLoader.getDefaultPluginContext(PluginNotInManifestActivity.class));`
`98`	`98`	`}`
`99`	`99`	`}`