From 091d310f3fa7609c38619d5f7a464703b62957a1 Mon Sep 17 00:00:00 2001
From: Bryant <Bryant@fanruan.com>
Date: Thu, 24 Oct 2019 16:04:20 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-23155=20=E8=A7=A3=E5=86=B3=E4=BB=8E?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E9=80=80=E5=9B=9E=E5=88=B0=E8=80=81?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E8=BF=98=E5=8E=9F=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../update/ui/dialog/RestoreResultDialog.java | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java
index d69d595e2..40516e208 100644
--- a/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java
+++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java
@@ -161,13 +161,13 @@ public class RestoreResultDialog extends JDialog {
         List<String> list = new ArrayList<>();
         String installHome = StableUtils.getInstallHome();
 
-        putJarBackupFilesToInstallLib(installHome, map, list);
-        putJarBackupFilesToInstallEnv(list);
+        filesToMove(installHome, map);
+        filesToDelete(installHome, list);
         RestartHelper.saveFilesWhichToMove(map);
         RestartHelper.saveFilesWhichToDelete(list.toArray(new String[list.size()]));
     }
 
-    private void putJarBackupFilesToInstallLib(String installHome, Map<String, String> map, List<String> list) {
+    private void filesToMove(String installHome, Map<String, String> map) {
         String backupDir = UpdateConstants.DESIGNER_BACKUP_DIR;
         String envHome = WorkContext.getCurrent().getPath();
         File installLib = new File(StableUtils.pathJoin(installHome, backupDir, jarRestoreDir, UpdateConstants.DESIGNERBACKUPPATH));
@@ -203,18 +203,9 @@ public class RestoreResultDialog extends JDialog {
                 }
             }
         }
-        installLib = new File(StableUtils.pathJoin(installHome,ProjectConstants.LIB_NAME));
-        files = installLib.listFiles();
-        if (files != null) {
-            for (File file : files) {
-                if (file.getName().startsWith(UpdateConstants.FINE) || file.getName().equals(UpdateConstants.ASPECTJRT)) {
-                    list.add(StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file.getName()));
-                }
-            }
-        }
     }
 
-    private void putJarBackupFilesToInstallEnv(List<String> list) {
+    private void filesToDelete(String installHome, List<String> list) {
         String envHome = WorkContext.getCurrent().getPath();
         File installEnv = new File(StableUtils.pathJoin(envHome,ProjectConstants.LIB_NAME));
         File[] files = installEnv.listFiles();
@@ -225,5 +216,14 @@ public class RestoreResultDialog extends JDialog {
                 }
             }
         }
+        installEnv = new File(StableUtils.pathJoin(installHome,ProjectConstants.LIB_NAME));
+        files = installEnv.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                if (file.getName().startsWith(UpdateConstants.FINE) || file.getName().equals(UpdateConstants.ASPECTJRT)) {
+                    list.add(StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file.getName()));
+                }
+            }
+        }
     }
 }
\ No newline at end of file