From 0e17cff816ad4b16bfebe55cd288fd18cd432dce Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 26 Nov 2023 17:13:53 +0300
Subject: [PATCH] v++

---
 .idea/workspace.xml                            | 18 +-----------------
 src/Visual_DVM_2021/Passes/SapforPass.java     |  3 ---
 .../Passes/SapforTransformation.java           |  8 ++++++++
 src/Visual_DVM_2021/Passes/Transformation.java |  8 ++++++++
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8ad2cdf7..e72260d4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,23 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCallH.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforTransformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforTransformation.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.java" afterDir="false" />
-    </list>
+    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/Visual_DVM_2021/Passes/SapforPass.java b/src/Visual_DVM_2021/Passes/SapforPass.java
index b2949234..b4d5c98c 100644
--- a/src/Visual_DVM_2021/Passes/SapforPass.java
+++ b/src/Visual_DVM_2021/Passes/SapforPass.java
@@ -1,7 +1,6 @@
 package Visual_DVM_2021.Passes;
 import Common.Current;
 import Common.UI.UI;
-import ProjectData.ProjectView;
 public class SapforPass extends SilentSapforPass {
     //отличается наличием журнала и сообщений
     @Override
@@ -24,8 +23,6 @@ public class SapforPass extends SilentSapforPass {
     @Override
     protected void showFinish() throws Exception {
         UI.getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages();
-        Current.set(Current.ProjectView, ProjectView.Files);
-        UI.getMainWindow().getProjectWindow().ShowProjectView();
         UI.getMainWindow().getProjectWindow().ShowProjectSapforLog();
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/SapforTransformation.java b/src/Visual_DVM_2021/Passes/SapforTransformation.java
index 08e21542..2609df9a 100644
--- a/src/Visual_DVM_2021/Passes/SapforTransformation.java
+++ b/src/Visual_DVM_2021/Passes/SapforTransformation.java
@@ -1,8 +1,10 @@
 package Visual_DVM_2021.Passes;
+import Common.Current;
 import Common.Global;
 import Common.UI.Menus_2023.PassMenuItem;
 import Common.UI.UI;
 import ProjectData.Project.db_project_info;
+import ProjectData.ProjectView;
 import Repository.Component.Sapfor.TransformationPermission;
 
 import javax.swing.*;
@@ -73,6 +75,12 @@ public class SapforTransformation extends SapforPass {
         target.undoLastTransformation();
     }
     @Override
+    protected void showFinish() throws Exception {
+        super.showFinish();
+        Current.set(Current.ProjectView, ProjectView.Files);
+        UI.getMainWindow().getProjectWindow().ShowProjectView();
+    }
+    @Override
     protected boolean canStart(Object... args) throws Exception {
         switch (Global.transformationPermission) {
             case All:
diff --git a/src/Visual_DVM_2021/Passes/Transformation.java b/src/Visual_DVM_2021/Passes/Transformation.java
index 1831012a..8bd04efa 100644
--- a/src/Visual_DVM_2021/Passes/Transformation.java
+++ b/src/Visual_DVM_2021/Passes/Transformation.java
@@ -1,7 +1,9 @@
 package Visual_DVM_2021.Passes;
+import Common.Current;
 import Common.UI.Menus_2023.PassMenuItem;
 import Common.UI.UI;
 import ProjectData.Project.db_project_info;
+import ProjectData.ProjectView;
 import Repository.Component.Sapfor.TransformationPermission;
 
 import javax.swing.*;
@@ -34,6 +36,12 @@ public class Transformation extends CurrentProjectPass {
         UI.getMainWindow().getProjectWindow().FocusVersions();
     }
     @Override
+    protected void showFinish() throws Exception {
+        super.showFinish();
+        Current.set(Current.ProjectView, ProjectView.Files);
+        UI.getMainWindow().getProjectWindow().ShowProjectView();
+    }
+    @Override
     protected void performDone() throws Exception {
         //миграция типов файлов.
         //это несапфоровские дела.тут копируем хедеры сами.