Browse Source

Pull request #4091: REPORT-51317 保存失败后,保存中加载动画还在

Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0

* commit 'fb0d6575de14889736788e0819b4e0d528989cae':
  REPORT-51317 保存失败后,保存中加载动画还在
feature/10.0
Hades 4 years ago
parent
commit
c3fee9ef44
  1. 6
      designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java

6
designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java

@ -52,13 +52,19 @@ public class SaveWorker extends SwingWorker<Boolean, Void> {
try {
success = get();
} catch (Exception e) {
processResult();
FineLoggerFactory.getLogger().error(e.getMessage(), e);
FineJOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design-Basic_Save_Failure"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.ERROR_MESSAGE);
return;
}
processResult();
}
private void processResult() {
this.template.setSaving(false);
// 恢复界面
if (slowly && ComparatorUtils.equals(this.template.getName(), HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getName())) {

Loading…
Cancel
Save