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

no message

Browse Source
This commit is contained in:
02090095
2024-10-08 23:33:00 +03:00
parent 42675d55d8
commit 07436988cf
9 changed files with 15 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.idea/workspace.xml generated
View File

@@ -8,21 +8,14 @@
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Current.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/DebugPrintLevel.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/GlobalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/Properties.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/UI.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/FormType.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Windows/SearchReplaceForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Windows/SearchReplaceForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/ParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/ParallelVariant.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
</list> </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" />
@@ -128,11 +121,11 @@
<recent name="Common.Utils.CommonUtils" /> <recent name="Common.Utils.CommonUtils" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Windows" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Syntax" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Syntax" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
<recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" /> <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" />
<recent name="E:\Visual_DVM_2020\src\Visual_DVM_2021\UI\Main" />
</key> </key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="Visual_DVM_2021.Passes.UI" /> <recent name="Visual_DVM_2021.Passes.UI" />

5
src/Common/Utils/Loggable.java
View File

@@ -1,6 +1,5 @@
package Common.Utils; package Common.Utils;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common_old.UI.DebugPrintLevel;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import java.io.File; import java.io.File;
@@ -30,10 +29,6 @@ public interface Loggable {
} catch (Exception ignored) { } catch (Exception ignored) {
} }
} }
default void Print(DebugPrintLevel level, String message) {
if (level.isEnabled())
Print(CommonUtils.Brackets(level.getDescription()) + " " + message);
}
default void PrintException(Exception ex) { default void PrintException(Exception ex) {
StringWriter out = new StringWriter(); StringWriter out = new StringWriter();
PrintWriter writer = new PrintWriter(out); PrintWriter writer = new PrintWriter(out);

17
src/Common_old/UI/DebugPrintLevel.java
View File

@@ -1,17 +0,0 @@
package Common_old.UI;
public enum DebugPrintLevel {
Undefined,
Passes,
Project;
public String getDescription() {
return toString();
}
public boolean isEnabled() {
switch (this) {
case Passes:
return true;
default:
return false;
}
}
}

2
src/Common_old/UI/UI.java
View File

@@ -14,7 +14,7 @@ import Common_old.UI.Menus_2023.VersionsMenuBar.VersionsMenuBar;
import Common_old.UI.Tables.*; import Common_old.UI.Tables.*;
import Common_old.UI.Trees.GraphTreeCellRenderer; import Common_old.UI.Trees.GraphTreeCellRenderer;
import Common_old.UI.Trees.SelectionTreeCellRenderer; import Common_old.UI.Trees.SelectionTreeCellRenderer;
import Common_old.UI.Windows.SearchReplaceForm; import _VisualDVM.Windows.SearchReplaceForm;
import GlobalData.Compiler.CompilersDBTable; import GlobalData.Compiler.CompilersDBTable;
import GlobalData.Compiler.CompilersMenuBar; import GlobalData.Compiler.CompilersMenuBar;
import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor; import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;

4
src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
View File

@@ -3,7 +3,6 @@ import Common.CurrentAnchestor;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common_old.Constants; import Common_old.Constants;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.DebugPrintLevel;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.Utils.Files.VDirectoryChooser; import Common_old.Utils.Files.VDirectoryChooser;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
@@ -55,12 +54,10 @@ public class OpenCurrentProject extends Pass_2021<db_project_info> {
mode = Mode.ProjectInfo; mode = Mode.ProjectInfo;
target = (db_project_info) arg; target = (db_project_info) arg;
dir = target.Home; dir = target.Home;
CommonUtils.MainLog.Print(DebugPrintLevel.Project, "готовая версия " + CommonUtils.Brackets(dir.getAbsolutePath()));
return needsOpen(); return needsOpen();
} }
} }
if ((dir != null) && needsOpen()) { if ((dir != null) && needsOpen()) {
CommonUtils.MainLog.Print(DebugPrintLevel.Project, CommonUtils.Brackets(dir.toString()));
if (!dir.isDirectory()) { if (!dir.isDirectory()) {
Log.Writeln_(CommonUtils.Brackets(dir) + "\nне является папкой!"); Log.Writeln_(CommonUtils.Brackets(dir) + "\nне является папкой!");
return false; return false;
@@ -95,7 +92,6 @@ public class OpenCurrentProject extends Pass_2021<db_project_info> {
return; return;
} }
} }
CommonUtils.MainLog.Print(DebugPrintLevel.Project, "построение дерева версий");
target = new db_project_info(dir); target = new db_project_info(dir);
new_root = target.CreateVersionsTree(); new_root = target.CreateVersionsTree();
target.Open(); target.Open();

5
src/Visual_DVM_2021/Passes/Pass_2021.java
View File

@@ -5,7 +5,6 @@ import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import GlobalData.GlobalDatabase; import GlobalData.GlobalDatabase;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.DebugPrintLevel;
import Common_old.UI.Menus_2023.PassButton; import Common_old.UI.Menus_2023.PassButton;
import Common_old.UI.Menus_2023.PassControl; import Common_old.UI.Menus_2023.PassControl;
import Common_old.UI.Menus_2023.StablePassMenuItem; import Common_old.UI.Menus_2023.StablePassMenuItem;
@@ -295,7 +294,7 @@ public class Pass_2021<T> {
target = null; target = null;
Log = new TextLog(); Log = new TextLog();
if (!getDescription().isEmpty()) if (!getDescription().isEmpty())
CommonUtils.MainLog.Print(DebugPrintLevel.Passes, getDescription() + " стартует.."); CommonUtils.MainLog.Print(getDescription() + " стартует..");
timer.Start(); timer.Start();
//-------------------------------> //------------------------------->
try { try {
@@ -382,7 +381,7 @@ public class Pass_2021<T> {
//-------------------------------> //------------------------------->
timer.Stop(); timer.Stop();
if (!getDescription().isEmpty()) { if (!getDescription().isEmpty()) {
CommonUtils.MainLog.Print(DebugPrintLevel.Passes, CommonUtils.MainLog.Print(
getDescription() + getDescription() +
" окончен за " + timer.Print() + " окончен за " + timer.Print() +
" состояние " + CommonUtils.Brackets(state.getDescription()) " состояние " + CommonUtils.Brackets(state.getDescription())

5
src/Visual_DVM_2021/Passes/SapforAnalysis.java
View File

@@ -2,7 +2,6 @@ package Visual_DVM_2021.Passes;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.DebugPrintLevel;
import Common_old.UI.Menus_2023.PassControl; import Common_old.UI.Menus_2023.PassControl;
import Common_old.UI.Menus_2023.PassMenuItem; import Common_old.UI.Menus_2023.PassMenuItem;
import Common_old.UI.UI; import Common_old.UI.UI;
@@ -83,7 +82,7 @@ public class SapforAnalysis extends SapforPass {
unpack(sapfor.getResult()); unpack(sapfor.getResult());
} }
if (!isAtomic() && !asDonePhase) { if (!isAtomic() && !asDonePhase) {
CommonUtils.MainLog.Print(DebugPrintLevel.Passes, "Поиск выполненных фаз.."); CommonUtils.MainLog.Print("Поиск выполненных фаз..");
sapfor.RunAnalysis( sapfor.RunAnalysis(
"SPF_GetPassesStateStr", "SPF_GetPassesStateStr",
-Global.messagesServer.getPort(), -Global.messagesServer.getPort(),
@@ -116,7 +115,7 @@ public class SapforAnalysis extends SapforPass {
} }
} }
} }
CommonUtils.MainLog.Print(DebugPrintLevel.Passes, "Фазы получены."); CommonUtils.MainLog.Print("Фазы получены.");
} }
} }
//--------------------------------------------- //---------------------------------------------

2
src/Common_old/UI/Windows/SearchReplaceForm.form → src/_VisualDVM/Windows/SearchReplaceForm.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Common_old.UI.Windows.SearchReplaceForm"> <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Windows.SearchReplaceForm">
<grid id="cbd77" binding="MainPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="cbd77" binding="MainPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="10" left="10" bottom="10" right="10"/> <margin top="10" left="10" bottom="10" right="10"/>
<constraints> <constraints>

2
src/Common_old/UI/Windows/SearchReplaceForm.java → src/_VisualDVM/Windows/SearchReplaceForm.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows; package _VisualDVM.Windows;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common.Visual.Windows.Form; import Common.Visual.Windows.Form;