Browse Source

Merge pull request #1093 in DESIGN/design from ~HUGH.C/design:feature/10.0 to feature/10.0

* commit '2c3b24af3c827d6f045f0970c61f0a36e2379ed9':
  REPORT-20981 模板版本管理减少磁盘占用(远程没有更新jar时,提示相应信息)
research/11.0
Hugh.C 5 years ago
parent
commit
4645f02b9d
  1. 30
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

30
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@ -897,17 +897,13 @@ public class PreferencePane extends BasicPane {
protected void done() {
try {
get();
} catch (InterruptedException | ExecutionException e) {
} catch (ExecutionException e) {
updateGcDialogPanelInfo(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Vcs_Need_Update_Remote_Server_Jar"));
return;
} catch (InterruptedException e) {
FineLoggerFactory.getLogger().error(e, e.getMessage());
}
stopGcProgressTimer();
gcMessage.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Vcs_Reduce_File_Size") + fileSizeConvert(size));
if (null != gcProgressBar) {
gcProgressBarPanel.remove(gcProgressBar);
}
if (null != gcDialog) {
gcDialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Joption_News"));
}
updateGcDialogPanelInfo(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Vcs_Reduce_File_Size") + fileSizeConvert(size));
gcDialogDownPane.revalidate();
gcDialogDownPane.repaint();
gcDialogDownPane.add(gcOkButton);
@ -932,6 +928,22 @@ public class PreferencePane extends BasicPane {
gcDialog.dispose();
}
/**
* gc 后更新进度条面板信息
*
* @param message
*/
private void updateGcDialogPanelInfo(String message) {
stopGcProgressTimer();
gcMessage.setText(message);
if (null != gcProgressBar) {
gcProgressBarPanel.remove(gcProgressBar);
}
if (null != gcDialog) {
gcDialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Joption_News"));
}
}
/**
* 初始化 gc 对话框
*/

Loading…
Cancel
Save