Merge pull request #1210 in DESIGN/design from ~BRYANT/design:release/10.0 to release/10.0

* commit '1bca44b7c73e5d7c244509008d8fff987496a2f9': REPORT-22779 更新后无法重启 REPORT-22779 更新后无法重启
5 years ago · 1d5fcd2901
6 changed files with 69 additions and 54 deletions
--- a/designer-base/src/main/java/com/fr/design/RestartHelper.java
+++ b/designer-base/src/main/java/com/fr/design/RestartHelper.java
@ -6,12 +6,12 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.os.OperatingSystem;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.os.support.OSBasedAction;
-import com.fr.stable.os.support.OSSupportCenter;
+import com.fr.workspace.WorkContext;

+import javax.swing.*;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@ -19,8 +19,6 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;

@ -33,7 +31,7 @@ public class RestartHelper {

    public static final String RECORD_FILE = StableUtils.pathJoin(StableUtils.getInstallHome(), "delete.properties");
    public static final String MOVE_FILE = StableUtils.pathJoin(StableUtils.getInstallHome(), "move.properties");
-    private static OSBasedAction restartAction;
+    private static final OSBasedAction restartAction = new RestartAction();

    /**
     * 把要删除的文件都记录到delete.properties中
@ -146,6 +144,20 @@ public class RestartHelper {
        restart(ArrayUtils.EMPTY_STRING_ARRAY);
    }

+    public static void restartForUpdate(JFrame frame) {
+        try {
+            restartAction.execute(ArrayUtils.EMPTY_STRING_ARRAY);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage());
+        } finally {
+            WorkContext.getCurrent().close();
+            frame.dispose();
+            System.exit(0);
+        }
+    }
+
+
+
    /**
     * 重启设计器并删除某些特定的文件
     *
@ -171,7 +183,6 @@ public class RestartHelper {
            }catch (Exception e){
                FineLoggerFactory.getLogger().error(e.getMessage(), e);
            }
-
            restartAction.execute(filesToBeDelete);
        } catch (Exception e) {
            FineLoggerFactory.getLogger().error(e.getMessage(), e);
@ -186,12 +197,4 @@ public class RestartHelper {
            DesignerContext.getDesignerFrame().exit();
        }
    }
-
-    /**
-     * 提前初始化重启动作
-     */
-    public static void initRestartAction(){
-        restartAction = OSSupportCenter.getAction(RestartAction.class);
-    }
-
 }
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@ -4,7 +4,6 @@
 package com.fr.design.mainframe;

 import com.fr.base.BaseUtils;
-import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
@ -113,9 +112,9 @@ import java.util.Set;

 public class DesignerFrame extends JFrame implements JTemplateActionListener, TargetModifiedListener {

-    public static final String DESIGNER_FRAME_NAME = "designer_frame";
+    private static final String DESIGNER_FRAME_NAME = "designer_frame";

-    public static final Dimension MIN_SIZE = new Dimension(100, 100);
+    private static final Dimension MIN_SIZE = new Dimension(100, 100);

    private static final long serialVersionUID = -8732559571067484460L;

@ -145,9 +144,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta

    private UIToolbar combineUp;

-    private NewTemplatePane newWorkBookPane = null;
+    private NewTemplatePane newWorkBookPane;

-    private Icon closeMode = UIConstants.CLOSE_OF_AUTHORITY;
+    private Icon closeMode;

    private JLayeredPane layeredPane = this.getLayeredPane();

@ -184,7 +183,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta

            SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true);
            // 只有一个文件未保存时
-            if (HistoryTemplateListPane.getInstance().getHistoryCount() == 1) {
+            if (HistoryTemplateListCache.getInstance().getHistoryCount() == 1) {
                int choose = saveSomeTempaltePane.saveLastOneTemplate();
                if (choose != JOptionPane.CANCEL_OPTION) {
                    DesignerFrame.this.exit();
@ -318,7 +317,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
            public void componentResized(ComponentEvent e) {

                reCalculateFrameSize();
-                if (DesignerMode.isAuthorityEditing()) {
+                if (DesignModeContext.isAuthorityEditing()) {
                    doResize();
                }
            }
@ -334,9 +333,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta

    public void resizeFrame() {

-        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setComposite();
+        HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().setComposite();
        reCalculateFrameSize();
-        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().doResize();
+        HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().doResize();
    }

    public void closeAuthorityEditing() {
@ -416,8 +415,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
    }

    /**
-     * @param ad
-     * @return
+     * @param ad 菜单栏
+     * @return panel
     */
    protected JPanel initNorthEastPane(final ToolBarMenuDock ad) {
        //hugh: private修改为protected方便oem的时候修改右上的组件构成
@ -515,7 +514,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta

    protected ArrayList<WindowListener> getFrameListeners() {

-        ArrayList<WindowListener> arrayList = new ArrayList<WindowListener>();
+        ArrayList<WindowListener> arrayList = new ArrayList<>();
        arrayList.add(windowAdapter);
        return arrayList;
    }
@ -593,7 +592,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     */
    public void refreshDottedLine() {

-        if (DesignerMode.isAuthorityEditing()) {
+        if (DesignModeContext.isAuthorityEditing()) {
            populateAuthorityArea();
            populateCloseButton();
            addDottedLine();
@ -633,7 +632,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     */
    private void fireAuthorityStateToNormal() {

-        java.util.List<JTemplate<?, ?>> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList();
+        List<JTemplate<?, ?>> opendedTemplate = HistoryTemplateListCache.getInstance().getHistoryList();
        for (JTemplate<?, ?> jTemplate : opendedTemplate) {
            // 如果在权限编辑时做过操作，则将做过的操作作为一个整体状态赋给正在报表
            if (jTemplate.isDoSomethingInAuthority()) {
@ -676,7 +675,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        for (UIButton fixButton : fixButtons) {
            combineUp.add(fixButton);
        }
-        if (!DesignerMode.isAuthorityEditing()) {
+        if (!DesignModeContext.isAuthorityEditing()) {
            combineUp.addSeparator(new Dimension(2, 16));
            if (toolbar4Form != null) {
                for (JComponent jComponent : toolbar4Form) {
@ -692,7 +691,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta

    private void addExtraButtons() {

-        JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
        if (jt == null) {
            return;
        }
@ -709,7 +708,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta

    private void addShareButton() {

-        JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
        if (jt == null) {
            return;
        }
@ -784,13 +783,13 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     */
    public void needToAddAuhtorityPaint() {

-        newWorkBookPane.setButtonGray(DesignerMode.isAuthorityEditing());
+        newWorkBookPane.setButtonGray(DesignModeContext.isAuthorityEditing());

        // 进入或退出权限编辑模式，通知插件
        Set<ShortCut> extraShortCuts = ExtraDesignClassManager.getInstance().getExtraShortCuts();
        for (ShortCut shortCut : extraShortCuts) {
            if (shortCut instanceof AbstractTemplateTreeShortCutProvider) {
-                shortCut.notifyFromAuhtorityChange(DesignerMode.isAuthorityEditing());
+                shortCut.notifyFromAuhtorityChange(DesignModeContext.isAuthorityEditing());
            }
        }
    }
@ -811,7 +810,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     */
    public void setTitle() {

-        JTemplate<?, ?> editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        JTemplate<?, ?> editingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
        StringBuilder defaultTitleSB = new StringBuilder();
        defaultTitleSB.append(ProductConstants.PRODUCT_NAME);
        defaultTitleSB.append(" ");
@ -909,7 +908,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta

    public void saveCurrentEditingTemplate() {

-        JTemplate<?, ?> editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        JTemplate<?, ?> editingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
        if (editingTemplate == null) {
            return;
        }
@ -1092,7 +1091,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        if (inValidDesigner(jt)) {
            this.addAndActivateJTemplate();
            MutilTempalteTabPane.getInstance().setTemTemplate(
-                    HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
+                    HistoryTemplateListCache.getInstance().getCurrentEditingTemplate());
        } else {
            activeTemplate(jt);
        }
@ -1106,8 +1105,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     */
    private void activeTemplate(JTemplate jt) {
        // 如果该模板已经打开，则进行激活就可以了
-        int index = HistoryTemplateListPane.getInstance().contains(jt);
-        List<JTemplate<?, ?>> historyList = HistoryTemplateListPane.getInstance().getHistoryList();
+        int index = HistoryTemplateListCache.getInstance().contains(jt);
+        List<JTemplate<?, ?>> historyList = HistoryTemplateListCache.getInstance().getHistoryList();
        if (index != -1) {
            historyList.get(index).activeJTemplate(index, jt);
        } else {
@ -1115,11 +1114,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        }
    }

-    /**
-     * Exit退出
-     */
-    public void exit() {
-
+    public void prepareForExit() {
        Thread thread = new Thread() {

            @Override
@ -1138,7 +1133,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        }

        DesignerEnvManager.getEnvManager().setLastOpenFile(
-                HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
+                HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());

        DesignerEnvManager.getEnvManager().setLastWestRegionToolPaneY(
                WestRegionContainerPane.getInstance().getToolPaneY());
@ -1150,6 +1145,13 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
                EastRegionContainerPane.getInstance().getContainerWidth());

        DesignerEnvManager.getEnvManager().saveXMLFile();
+    }
+
+    /**
+     * Exit退出
+     */
+    public void exit() {
+        prepareForExit();
        //关闭当前环境
        WorkContext.getCurrent().close();

@ -1251,7 +1253,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
    /**
     * 更新进度框进度
     *
-     * @param progress
+     * @param progress 进度值
     */
    public void updateProgress(int progress) {

--- a/designer-base/src/main/java/com/fr/design/os/impl/RestartAction.java
+++ b/designer-base/src/main/java/com/fr/design/os/impl/RestartAction.java
@ -10,10 +10,19 @@ import java.util.ArrayList;
 import java.util.List;

 public class RestartAction implements OSBasedAction {
+
+    private static String installHome;
+
+    public RestartAction() {
+        installHome = StableUtils.getInstallHome();
+    }
+
    @Override
    public void execute(Object... objects) {
        String[] filesToBeDelete = (String[])objects;
-        String installHome = StableUtils.getInstallHome();
+        if (installHome == null) {
+            installHome = StableUtils.getInstallHome();
+        }
        try{
            if (OperatingSystem.isMacos()) {
               restartInMacOS(installHome, filesToBeDelete);
--- a/designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java
+++ b/designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java
@ -3,6 +3,7 @@ package com.fr.design.update.actions;
 import com.fr.decision.update.backup.Recover;
 import com.fr.decision.update.data.UpdateConstants;
 import com.fr.decision.update.exception.UpdateException;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.CommonIOUtils;
 import com.fr.general.GeneralUtils;
 import com.fr.general.IOUtils;
@ -46,8 +47,9 @@ public class RecoverForDesigner implements Recover {
            CommonUtils.mkdirs(file);
            IOUtils.copyFilesInDirByPath(StableUtils.pathJoin(installHome,ProjectConstants.LIB_NAME),
                    StableUtils.pathJoin(installHome, UpdateConstants.DESIGNERBACKUPPATH));
+            DesignerContext.getDesignerFrame().prepareForExit();
            return true;
-        }catch (IOException e) {
+        } catch (IOException e) {
            UpdateException exception = new UpdateException("Backup Exception for designer" + e.getMessage());
            FineLoggerFactory.getLogger().error(exception.getMessage(),exception);
            return false;
--- a/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
+++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
@ -47,10 +47,8 @@ import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
+import java.util.*;
 import java.util.List;
-import java.util.Locale;
 import java.util.concurrent.ExecutionException;

 import static java.nio.charset.StandardCharsets.*;
@ -594,19 +592,22 @@ public class UpdateMainDialog extends UIDialog {
                    UpdateCallBack callBack = new UpdateProgressCallBack(progressBar);
                    updateButton.setEnabled(false);
                    updateLabel.setVisible(false);
+                    RestoreResultDialog.deletePreviousPropertyFile();
+                    final JFrame frame = DesignerContext.getDesignerFrame();
+                    final RestartHelper helper = new RestartHelper();
                    new FileProcess(callBack) {
                        @Override
                        public void onDownloadSuccess() {
                            progressBar.setVisible(false);
                            deleteForDesignerUpdate();
-                            RestartHelper.restart();
+                            helper.restartForUpdate(frame);
                        }
                        @Override
                        public void onDownloadFailed() {
                            progressBar.setVisible(false);
                            deleteForDesignerUpdate();
                            JOptionPane.showMessageDialog(getParent(), Toolkit.i18nText("Fine-Design_Update_Info_Failed_Message"));
-                            RestartHelper.restart();
+                            helper.restartForUpdate(frame);
                        }
                    }.execute();
                }
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
@ -11,7 +11,6 @@ import com.fr.config.MarketConfig;
 import com.fr.decision.update.backup.RecoverManager;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.RestartHelper;
 import com.fr.design.actions.NewFormAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.insert.cell.BiasCellAction;
@ -140,7 +139,6 @@ public class DesignerActivator extends Activator {
        storePassport();
        AlphaFineHelper.switchConfig4Locale();
        RecoverManager.register(new RecoverForDesigner());
-        RestartHelper.initRestartAction();
    }

    @Override