Browse Source

REPORT-100518 无磁盘写入权限,版本迁移无异常提示

newui
Destiny.Lin 2 years ago
parent
commit
c7ea9190a7
  1. 22
      designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java

22
designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java

@ -378,7 +378,7 @@ public class VcsMovePanel extends BasicPane {
} }
private class MoveWorker extends SwingWorker<Void, Integer> { private class MoveWorker extends SwingWorker<Boolean, Integer> {
private VcsMoveStrategy strategy; private VcsMoveStrategy strategy;
@ -387,7 +387,7 @@ public class VcsMovePanel extends BasicPane {
} }
@Override @Override
protected Void doInBackground() throws Exception { protected Boolean doInBackground() throws Exception {
try { try {
//开始迁移 //开始迁移
VcsMoveService.getInstance().startMove(new VcsMoveService.BaseMoveServiceWhileMoving() { VcsMoveService.getInstance().startMove(new VcsMoveService.BaseMoveServiceWhileMoving() {
@ -402,13 +402,10 @@ public class VcsMovePanel extends BasicPane {
} }
}, strategy); }, strategy);
} catch (Exception e) { } catch (Exception e) {
this.cancel(true);
VcsMoveService.getInstance().stopMoving(); VcsMoveService.getInstance().stopMoving();
initFailedPane(); return false;
VcsMovePanel.this.getParentCard().show(getParentPane(), FAILED);
FineLoggerFactory.getLogger().error("[VcsV2] Vcs move failed!");
} }
return null; return true;
} }
@Override @Override
@ -419,12 +416,21 @@ public class VcsMovePanel extends BasicPane {
@Override @Override
protected void done() { protected void done() {
VcsMoveService.getInstance().stopMoving(); VcsMoveService.getInstance().stopMoving();
try {
if (get()) {
initSuccessPane(); initSuccessPane();
VcsMovePanel.this.getParentCard().show(getParentPane(), SUCCESS); VcsMovePanel.this.getParentCard().show(getParentPane(), SUCCESS);
VcsHelper.getInstance().updateLegacyMode(); VcsHelper.getInstance().updateLegacyMode();
} else {
initFailedPane();
VcsMovePanel.this.getParentCard().show(getParentPane(), FAILED);
FineLoggerFactory.getLogger().error("[VcsV2] Vcs move failed!");
}
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e);
}
} }
} }
/** /**
* 迁移回调事件 * 迁移回调事件

Loading…
Cancel
Save