diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java index 8eb4a9afb7..26e25bae3c 100644 --- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java +++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java @@ -46,7 +46,7 @@ import com.fr.workspace.WorkspaceSwitchProcess; import com.fr.workspace.base.WorkspaceAPI; import com.fr.workspace.connect.WorkspaceConnectionInfo; import com.fr.workspace.engine.base.FineObjectPool; -import com.fr.workspace.engine.channel.http.FunctionalHttpRequest; +import com.fr.workspace.engine.client.utils.FunctionalHttpRequest; import com.fr.workspace.engine.exception.WorkspaceConnectionException; import com.fr.workspace.engine.rpc.WorkspaceProxyPool; import static javax.swing.JOptionPane.QUESTION_MESSAGE; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsExceptionUtils.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsExceptionUtils.java index 9ab310bbac..f6f7c5d4c4 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsExceptionUtils.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsExceptionUtils.java @@ -1,8 +1,8 @@ package com.fr.design.mainframe.vcs; import com.fr.design.i18n.Toolkit; +import com.fr.workspace.server.vcs.v2.VcsTaskResult.ErrorType; -import java.io.IOException; import java.util.HashMap; /** @@ -14,10 +14,10 @@ import java.util.HashMap; */ public class VcsExceptionUtils { - public static final HashMap EXCEPTION_MAP = new HashMap() { + public static final HashMap EXCEPTION_MAP = new HashMap() { { - put(IOException.class, Toolkit.i18nText("Fine-Design_Vcs_Exception_IO")); - put(UnsupportedOperationException.class, Toolkit.i18nText("Fine-Design_Vcs_Exception_Un_Support")); + put(ErrorType.IO_EXCEPTION, Toolkit.i18nText("Fine-Design_Vcs_Exception_IO")); + put(ErrorType.UNSUPPORTED_OPERATION, Toolkit.i18nText("Fine-Design_Vcs_Exception_Un_Support")); } }; @@ -25,9 +25,9 @@ public class VcsExceptionUtils { /** * 根据异常返回结果描述文案 */ - public static String createDetailByException(Exception e) { - for (Class key : EXCEPTION_MAP.keySet()) { - if (key.isAssignableFrom(e.getClass())) { + public static String createDetailByException(ErrorType e) { + for (ErrorType key : EXCEPTION_MAP.keySet()) { + if (key.equals(e)) { return EXCEPTION_MAP.get(key); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java index 2c8401c94c..dd6f645482 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java @@ -10,7 +10,6 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.iprogressbar.ModernUIProgressBarUI; -import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; @@ -26,8 +25,12 @@ import com.fr.design.widget.FRWidgetFactory; import com.fr.general.FRFont; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; +import com.fr.workspace.server.vcs.v2.VcsTaskResult; +import com.fr.workspace.server.vcs.v2.VcsTaskResult.ErrorType; import com.fr.workspace.server.vcs.v2.move.VcsMoveService; +import com.fr.workspace.server.vcs.v2.move.VcsMoveService.BaseMoveServiceWhileMoving; import com.fr.workspace.server.vcs.v2.move.VcsMoveStrategy; +import static javax.swing.JOptionPane.YES_OPTION; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; @@ -36,7 +39,10 @@ import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.CardLayout; +import java.awt.Color; +import java.awt.Cursor; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -44,9 +50,6 @@ import java.awt.event.MouseEvent; import java.util.List; import java.util.concurrent.ExecutionException; -import static javax.swing.JOptionPane.YES_NO_CANCEL_OPTION; -import static javax.swing.JOptionPane.YES_OPTION; - /** * 迁移面板 @@ -462,21 +465,27 @@ public class VcsMovePanel extends BasicPane { protected Boolean doInBackground() throws Exception { try { //开始迁移 - VcsMoveService.getInstance().startMove(new VcsMoveService.BaseMoveServiceWhileMoving() { + VcsTaskResult vcsTaskResult = VcsMoveService.getInstance().startMove(new BaseMoveServiceWhileMoving() { @Override public void publishProgress() { int num = VcsMoveService.getInstance().getCurrentMove(); publish(num); } + @Override public void prepare4Move() { PROGRESS_BAR.setMaximum(VcsMoveService.getInstance().getTotal()); } }, strategy); + + if (vcsTaskResult != null && !vcsTaskResult.isSuccess()) { + ErrorType errorType = vcsTaskResult.getErrorType(); + detail = VcsExceptionUtils.createDetailByException(errorType); + } } catch (Exception e) { - VcsMoveService.getInstance().stopMoving(); - detail = VcsExceptionUtils.createDetailByException(e); return false; + } finally { + VcsMoveService.getInstance().stopMoving(); } return true; } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java index 11da401226..2325d4ae05 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java @@ -17,8 +17,6 @@ import com.fr.design.mainframe.vcs.common.VcsCacheFileNodeFile; import com.fr.design.mainframe.vcs.common.VcsHelper; import com.fr.file.FileNodeFILE; import com.fr.file.filetree.FileNode; -import com.fr.file.filetree.FileNodes; -import com.fr.io.utils.ResourceIOUtils; import com.fr.report.InconsistentLockException; import com.fr.report.entity.VcsEntity; import com.fr.stable.StableUtils; @@ -29,6 +27,7 @@ import com.fr.workspace.resource.WorkResource; import com.fr.workspace.server.vcs.VcsFileUtils; import com.fr.workspace.server.vcs.VcsOperator; import com.fr.workspace.server.vcs.v2.VcsTaskResult; +import com.fr.workspace.server.vcs.v2.VcsTaskResult.ErrorType; import javax.swing.Icon; import javax.swing.JComponent; @@ -36,7 +35,7 @@ import javax.swing.JOptionPane; import javax.swing.JTable; import javax.swing.SwingWorker; import javax.swing.UIManager; -import java.awt.*; +import java.awt.Point; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; @@ -216,7 +215,7 @@ public class VcsNewPane extends RecyclePane { } DesignerContext.getDesignerFrame().openTemplate(new FileNodeFILE(new FileNode(filePath, false))); } else { - if (result.getException() instanceof FileNotFoundException) { + if (ErrorType.FILE_NOT_FOUND.equals(result.getErrorType())) { FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Warning_Template_Do_Not_Exsit")); } else { FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Vcs_Open_Lock_Tip"), UIManager.getString("OptionPane.messageDialogTitle"), JOptionPane.ERROR_MESSAGE); diff --git a/designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java b/designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java index a6a2d7896a..5ddabec4ef 100644 --- a/designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java +++ b/designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java @@ -35,7 +35,7 @@ import com.fr.workspace.WorkContext; import com.fr.workspace.base.WorkspaceAPI; import com.fr.workspace.connect.WorkspaceConnectionInfo; import com.fr.workspace.engine.base.FineObjectPool; -import com.fr.workspace.engine.channel.http.FunctionalHttpRequest; +import com.fr.workspace.engine.client.utils.FunctionalHttpRequest; import com.fr.workspace.engine.exception.WorkspaceConnectionException; import com.fr.workspace.engine.rpc.WorkspaceProxyPool; import com.fr.workspace.server.check.VersionInfoOperator; diff --git a/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java b/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java index cab7037cd2..e6da979d7f 100644 --- a/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java +++ b/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java @@ -1,6 +1,5 @@ package com.fr.design; -import com.fr.design.plugin.remind.PluginErrorDesignReminder; import com.fr.plugin.error.PluginErrorRemindHandler; import com.fr.design.env.DesignerWorkspaceInfo; import com.fr.design.env.DesignerWorkspaceType; @@ -9,9 +8,8 @@ import com.fr.design.env.RemoteDesignerWorkspaceInfo; import com.fr.env.CheckServiceDialog; import com.fr.invoke.Reflect; import com.fr.workspace.WorkContext; -import com.fr.workspace.Workspace; import com.fr.workspace.connect.WorkspaceConnectionInfo; -import com.fr.workspace.engine.channel.http.FunctionalHttpRequest; +import com.fr.workspace.engine.client.utils.FunctionalHttpRequest; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java index 95115cd04b..fc5271ffdb 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java @@ -1,18 +1,13 @@ package com.fr.design.actions.file.newReport; -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; - -import javax.swing.KeyStroke; - - -import com.fr.base.svg.IconUtils; import com.fr.design.actions.UpdateAction; +import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JPolyWorkBook; - -import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; +import javax.swing.KeyStroke; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; public class NewPolyReportAction extends UpdateAction { diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java index 371e952baf..7808690ffd 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java @@ -3,18 +3,16 @@ package com.fr.design.actions.file.newReport; import com.fr.base.svg.IconUtils; import com.fr.design.actions.UpdateAction; +import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JWorkBook; import com.fr.design.menu.MenuKeySet; - import javax.swing.Icon; import javax.swing.KeyStroke; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; -import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; - public class NewWorkBookAction extends UpdateAction { public NewWorkBookAction() {