M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v++

Browse Source
This commit is contained in:
02090095
2023-11-26 17:13:53 +03:00
parent 269615abcb
commit 0e17cff816
4 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.idea/workspace.xml generated
View File

@@ -6,23 +6,7 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

3
src/Visual_DVM_2021/Passes/SapforPass.java
View File

@@ -1,7 +1,6 @@
package Visual_DVM_2021.Passes; package Visual_DVM_2021.Passes;
import Common.Current; import Common.Current;
import Common.UI.UI; import Common.UI.UI;
import ProjectData.ProjectView;
public class SapforPass extends SilentSapforPass { public class SapforPass extends SilentSapforPass {
//отличается наличием журнала и сообщений //отличается наличием журнала и сообщений
@Override @Override
@@ -24,8 +23,6 @@ public class SapforPass extends SilentSapforPass {
@Override @Override
protected void showFinish() throws Exception { protected void showFinish() throws Exception {
UI.getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages(); UI.getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages();
Current.set(Current.ProjectView, ProjectView.Files);
UI.getMainWindow().getProjectWindow().ShowProjectView();
UI.getMainWindow().getProjectWindow().ShowProjectSapforLog(); UI.getMainWindow().getProjectWindow().ShowProjectSapforLog();
} }
@Override @Override

8
src/Visual_DVM_2021/Passes/SapforTransformation.java
View File

@@ -1,8 +1,10 @@
package Visual_DVM_2021.Passes; package Visual_DVM_2021.Passes;
import Common.Current;
import Common.Global; import Common.Global;
import Common.UI.Menus_2023.PassMenuItem; import Common.UI.Menus_2023.PassMenuItem;
import Common.UI.UI; import Common.UI.UI;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;
import ProjectData.ProjectView;
import Repository.Component.Sapfor.TransformationPermission; import Repository.Component.Sapfor.TransformationPermission;
import javax.swing.*; import javax.swing.*;
@@ -73,6 +75,12 @@ public class SapforTransformation extends SapforPass {
target.undoLastTransformation(); target.undoLastTransformation();
} }
@Override @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 { protected boolean canStart(Object... args) throws Exception {
switch (Global.transformationPermission) { switch (Global.transformationPermission) {
case All: case All:

8
src/Visual_DVM_2021/Passes/Transformation.java
View File

@@ -1,7 +1,9 @@
package Visual_DVM_2021.Passes; package Visual_DVM_2021.Passes;
import Common.Current;
import Common.UI.Menus_2023.PassMenuItem; import Common.UI.Menus_2023.PassMenuItem;
import Common.UI.UI; import Common.UI.UI;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;
import ProjectData.ProjectView;
import Repository.Component.Sapfor.TransformationPermission; import Repository.Component.Sapfor.TransformationPermission;
import javax.swing.*; import javax.swing.*;
@@ -34,6 +36,12 @@ public class Transformation extends CurrentProjectPass {
UI.getMainWindow().getProjectWindow().FocusVersions(); UI.getMainWindow().getProjectWindow().FocusVersions();
} }
@Override @Override
protected void showFinish() throws Exception {
super.showFinish();
Current.set(Current.ProjectView, ProjectView.Files);
UI.getMainWindow().getProjectWindow().ShowProjectView();
}
@Override
protected void performDone() throws Exception { protected void performDone() throws Exception {
//миграция типов файлов. //миграция типов файлов.
//это несапфоровские дела.тут копируем хедеры сами. //это несапфоровские дела.тут копируем хедеры сами.