Browse Source

Merge pull request #948 in BA/design from ~JU/ba-9.0-design:9.0 to 9.0

* commit '4f9368c928731f788ecbde186e3a07f8152323b9':
  修改检测到有依赖的插件需处理时的ErrorCode名称
master
superman 7 years ago
parent
commit
018df83515
  1. 2
      designer_base/src/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
  2. 2
      designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
  3. 2
      designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
  4. 2
      designer_base/src/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
  5. 2
      designer_base/src/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java

2
designer_base/src/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java

@ -34,7 +34,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
if (result.isSuccess()) {
FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Success"));
JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Success"));
} else if (result.errorCode() == PluginErrorCode.NeedInstallInterPluginDependency) {
} else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Install_Dependence")),

2
designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java

@ -33,7 +33,7 @@ public class InstallOnlineCallback extends AbstractPluginTaskCallback {
if (result.isSuccess()) {
FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Success"));
JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Success"));
} else if (result.errorCode() == PluginErrorCode.NeedInstallInterPluginDependency) {
} else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Install_Dependence")),

2
designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java

@ -26,7 +26,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
jsCallback.execute("success");
FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Delete_Success"));
JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Delete_Success"));
}else if (result.errorCode() == PluginErrorCode.NeedInstallInterPluginDependency) {
}else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Delete_Dependence")),

2
designer_base/src/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java

@ -34,7 +34,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
if (result.isSuccess()) {
FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Success"));
JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Update_Success"));
} else if (result.errorCode() == PluginErrorCode.NeedInstallInterPluginDependency) {
} else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Update_Dependence")),

2
designer_base/src/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java

@ -34,7 +34,7 @@ public class UpdateOnlineCallback extends AbstractPluginTaskCallback {
if (result.isSuccess()) {
FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Success"));
JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Update_Success"));
} else if (result.errorCode() == PluginErrorCode.NeedInstallInterPluginDependency) {
} else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Update_Dependence")),

Loading…
Cancel
Save