|
|
|
@ -44,25 +44,21 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
|
|
|
|
|
FineLoggerFactory.getLogger().info(successInfo); |
|
|
|
|
FineJOptionPane.showMessageDialog(null, successInfo); |
|
|
|
|
} else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) { |
|
|
|
|
int rv = FineJOptionPane.showOptionDialog( |
|
|
|
|
null, |
|
|
|
|
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence"), |
|
|
|
|
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), |
|
|
|
|
FineJOptionPane.YES_NO_CANCEL_OPTION, |
|
|
|
|
FineJOptionPane.INFORMATION_MESSAGE, |
|
|
|
|
int rv = FineJOptionPane.showConfirmDialog( |
|
|
|
|
null, |
|
|
|
|
FineJOptionPane.OPTION_YES_NO_CANCEL, |
|
|
|
|
null |
|
|
|
|
Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence"), |
|
|
|
|
Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), |
|
|
|
|
FineJOptionPane.OK_CANCEL_OPTION, |
|
|
|
|
FineJOptionPane.INFORMATION_MESSAGE |
|
|
|
|
); |
|
|
|
|
if (rv == FineJOptionPane.NO_OPTION || rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
List<PluginTask> pluginTasks = result.getPreTasks(); |
|
|
|
|
for(PluginTask pluginTask : pluginTasks){ |
|
|
|
|
PluginMarker marker = pluginTask.getMarker(); |
|
|
|
|
PluginOperateUtils.installPluginOnline(marker, jsCallback); |
|
|
|
|
if (rv == FineJOptionPane.OK_OPTION) { |
|
|
|
|
List<PluginTask> pluginTasks = result.getPreTasks(); |
|
|
|
|
for(PluginTask pluginTask : pluginTasks){ |
|
|
|
|
PluginMarker marker = pluginTask.getMarker(); |
|
|
|
|
PluginOperateUtils.installPluginOnline(marker, jsCallback); |
|
|
|
|
} |
|
|
|
|
PluginManager.getController().install(zipFile, new InstallFromDiskCallback(zipFile, jsCallback)); |
|
|
|
|
} |
|
|
|
|
PluginManager.getController().install(zipFile, new InstallFromDiskCallback(zipFile, jsCallback)); |
|
|
|
|
} else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){ |
|
|
|
|
int rv = FineJOptionPane.showConfirmDialog( |
|
|
|
|
null, |
|
|
|
|