Browse Source

update

master
Fangjie Hu 8 years ago
parent
commit
575df71859
  1. 4
      designer_base/src/com/fr/design/extra/PluginHelper.java
  2. 2
      designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java
  3. 6
      designer_base/src/com/fr/design/extra/plugindependence/PluginDependenceUtils.java

4
designer_base/src/com/fr/design/extra/PluginHelper.java

@ -3,7 +3,7 @@ package com.fr.design.extra;
import com.fr.base.Env; import com.fr.base.Env;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.extra.plugindependence.DownLoadDependenceUtils; import com.fr.design.extra.plugindependence.PluginDependenceUtils;
import com.fr.general.*; import com.fr.general.*;
import com.fr.general.http.HttpClient; import com.fr.general.http.HttpClient;
import com.fr.plugin.Plugin; import com.fr.plugin.Plugin;
@ -134,7 +134,7 @@ public class PluginHelper {
for (int i = 0;list != null && i < list.size(); i++){ for (int i = 0;list != null && i < list.size(); i++){
PluginDependenceUnit preDependence = list.get(i); PluginDependenceUnit preDependence = list.get(i);
if (!preDependence.checkFileEnv()){ if (!preDependence.checkFileEnv()){
DownLoadDependenceUtils.preDependenceOnline(currentID, preDependence.getDependenceID(), preDependence.getFileDir()); PluginDependenceUtils.installDependenceOnline(currentID, preDependence.getDependenceID(), preDependence.getFileDir());
} }
} }
} }

2
designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java

@ -215,7 +215,7 @@ public class DownLoadDependenceUI implements ActionListener {
} }
} }
public boolean preOnline() { public boolean installOnline() {
int choose = JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Designer-Plugin_Plugin") + currentID + Inter.getLocText("Need") + dependenceID + Inter.getLocText("Support") + "," + Inter.getLocText("Need_Install") + dependenceID + "(" + showFileLength() + " m)?", "install tooltip", JOptionPane.YES_NO_OPTION); int choose = JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Designer-Plugin_Plugin") + currentID + Inter.getLocText("Need") + dependenceID + Inter.getLocText("Support") + "," + Inter.getLocText("Need_Install") + dependenceID + "(" + showFileLength() + " m)?", "install tooltip", JOptionPane.YES_NO_OPTION);
if (choose == 0){//下载安装 if (choose == 0){//下载安装
if (!connectToServer()){ if (!connectToServer()){

6
designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUtils.java → designer_base/src/com/fr/design/extra/plugindependence/PluginDependenceUtils.java

@ -5,9 +5,9 @@ package com.fr.design.extra.plugindependence;
*/ */
public class DownLoadDependenceUtils { public class PluginDependenceUtils {
public static boolean preDependenceOnline(String currentID, String dependenceID, String dependenceDir) { public static boolean installDependenceOnline(String currentID, String dependenceID, String dependenceDir) {
DownLoadDependenceUI ui = new DownLoadDependenceUI(currentID, dependenceID, dependenceDir); DownLoadDependenceUI ui = new DownLoadDependenceUI(currentID, dependenceID, dependenceDir);
return ui.preOnline(); return ui.installOnline();
} }
} }
Loading…
Cancel
Save