Browse Source

Pull request #4288: REPORT-52462 保存模板时,将设计器最小化到后台,模板保存失败的弹窗到了屏幕左上角

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

* commit '9c9a301a971462c7aebd2fc326a689036897b80e':
  REPORT-52462 保存模板时,将设计器最小化到后台,模板保存失败的弹窗到了屏幕左上角
final/10.0
Kara 4 years ago
parent
commit
f8c74e4f32
  1. 4
      designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java

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

@ -10,6 +10,7 @@ import com.fr.design.mainframe.JTemplate;
import com.fr.design.worker.WorkerManager; import com.fr.design.worker.WorkerManager;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import java.awt.Frame;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
@ -54,8 +55,9 @@ public class SaveWorker extends SwingWorker<Boolean, Void> {
} catch (Exception e) { } catch (Exception e) {
processResult(); processResult();
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
boolean minimized = (DesignerContext.getDesignerFrame().getExtendedState() & Frame.ICONIFIED ) != 0;
FineJOptionPane.showMessageDialog( FineJOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(), minimized ? null : DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design-Basic_Save_Failure"), Toolkit.i18nText("Fine-Design-Basic_Save_Failure"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.ERROR_MESSAGE); JOptionPane.ERROR_MESSAGE);

Loading…
Cancel
Save