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

фикс багов с отображением тестов и внесенного бага печати исключений

Browse Source 
++
This commit is contained in:
02090095
2025-03-05 20:25:23 +03:00
parent 39f5b99ade
commit 20aef1f340
8 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/workspace.xml generated
View File

@@ -7,11 +7,14 @@
</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 afterPath="$PROJECT_DIR$/src/icons/versions/Inactive.png" afterDir="false" />
<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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.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" />
@@ -90,7 +93,7 @@
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" /> <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" /> <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
<property name="extract.method.default.visibility" value="public" /> <property name="extract.method.default.visibility" value="public" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/libs/commons-lang-2.6.0.jar" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/versions" />
<property name="project.structure.last.edited" value="Libraries" /> <property name="project.structure.last.edited" value="Libraries" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.27322906" /> <property name="project.structure.side.proportion" value="0.27322906" />
@@ -103,11 +106,11 @@
<recent name="controls.Trees" /> <recent name="controls.Trees" />
</key> </key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
<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\icons\Transformations" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
</key> </key>
<key name="MoveMembersDialog.RECENTS_KEY"> <key name="MoveMembersDialog.RECENTS_KEY">
<recent name="_VisualDVM.Constants" /> <recent name="_VisualDVM.Constants" />

8
properties
View File

@@ -4,7 +4,7 @@
"ServerUserPassword": "mprit_2011", "ServerUserPassword": "mprit_2011",
"OfferRegistrationOnStart": true, "OfferRegistrationOnStart": true,
"Workspace": "E:\\Tests", "Workspace": "E:\\Tests",
"ProjectsSearchDirectory": "E:\\BUG", "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system", "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
"VisualiserPath": "C:\\Users\\misha\\Downloads", "VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F", "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
@@ -28,9 +28,9 @@
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,
"AutoCheckTesting": true, "AutoCheckTesting": true,
"EmailOnTestingProgress": true, "EmailOnTestingProgress": true,
"lastMachineId": 28, "lastMachineId": 13,
"lastUserId": 36, "lastUserId": 34,
"lastCompilerId": 109, "lastCompilerId": 52,
"RegisterOn": false, "RegisterOn": false,
"SpacesOn": false, "SpacesOn": false,
"EmptyLinesOn": false, "EmptyLinesOn": false,

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

@@ -35,8 +35,8 @@ public interface Loggable {
ex.printStackTrace(writer); ex.printStackTrace(writer);
writer.flush(); writer.flush();
Print(out.toString()); Print(out.toString());
Utils_.CopyToClipboard(out.toString());
if (UI.isActive()) { if (UI.isActive()) {
Utils_.CopyToClipboard(out.toString());
ReadOnlyMultilineTextForm ff = new ReadOnlyMultilineTextForm(); ReadOnlyMultilineTextForm ff = new ReadOnlyMultilineTextForm();
ff.ShowDialog("Возникло исключение", out.toString()); ff.ShowDialog("Возникло исключение", out.toString());
} }

16
src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.ComponentsServer.Component.Sapfor;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Passes.PassException; import Common.Passes.PassException;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Utils.Vector_;
import Common.Visual.UI; import Common.Visual.UI;
import _VisualDVM.ComponentsServer.Component.OSDComponent; import _VisualDVM.ComponentsServer.Component.OSDComponent;
import _VisualDVM.ComponentsServer.Component.Visualizer_2; import _VisualDVM.ComponentsServer.Component.Visualizer_2;
@@ -17,10 +18,9 @@ import org.apache.commons.io.FileUtils;
import java.io.File; import java.io.File;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Collections; import java.nio.file.Files;
import java.util.LinkedHashMap; import java.nio.file.attribute.PosixFilePermission;
import java.util.List; import java.util.*;
import java.util.Vector;
public abstract class Sapfor extends OSDComponent { public abstract class Sapfor extends OSDComponent {
public static final int empty_code = -100; public static final int empty_code = -100;
public static final int canceled_code = -99; public static final int canceled_code = -99;
@@ -213,7 +213,13 @@ public abstract class Sapfor extends OSDComponent {
Charset.defaultCharset()); Charset.defaultCharset());
if (!file.setExecutable(true)) if (!file.setExecutable(true))
throw new Exception("Не удалось сделать файл скрипта " + name + " исполняемым!"); throw new Exception("Не удалось сделать файл скрипта " + name + " исполняемым!");
//-- //-- Windows
if (!Utils_.isWindows()) {
Set<PosixFilePermission> permissions = new HashSet<>();
permissions.add(PosixFilePermission.OWNER_EXECUTE);
permissions.add(PosixFilePermission.OWNER_READ);
Files.setPosixFilePermissions(file.toPath(), permissions);
}
boolean flag = false; boolean flag = false;
do { do {
try { try {

2
src/_VisualDVM/Constants.java
View File

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
import java.util.Vector; import java.util.Vector;
public class Constants { public class Constants {
public static final int version = 1192; public static final int version = 1195;
public static final int planner_version = 12; public static final int planner_version = 12;
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины. public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
//-- //--

2
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
View File

@@ -37,7 +37,7 @@ public class DVMCompilationTask extends DVMTask {
checkedEnvironments, checkedEnvironments,
kernels_in kernels_in
)); ));
} else } else kill
for (String matrix : matrixes) { for (String matrix : matrixes) {
runTasks.add(new DVMRunTask( runTasks.add(new DVMRunTask(
configuration, configuration,

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
View File

@@ -5,11 +5,8 @@ import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
public abstract class SapforPackageTreeNode extends DefaultMutableTreeNode { public abstract class SapforPackageTreeNode extends DefaultMutableTreeNode {
public ImageIcon getIcon() { public ImageIcon getIcon() {
// Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
ImageIcon res = new ImageIcon((getClass().getResource("/icons/versions/" + getImageKey() + ".png"))); ImageIcon res = new ImageIcon((getClass().getResource("/icons/versions/" + getImageKey() + ".png")));
if (res == null) {
Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
// res= new ImageIcon((getClass().getResource("/icons/versions/Version.png")));
}
return (getImageKey() != null) ? res : null; return (getImageKey() != null) ? res : null;
} }
public abstract String getImageKey(); public abstract String getImageKey();

BIN
src/icons/versions/Inactive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 644 B