diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c6b0ccc9..f1ebc127 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,16 +9,13 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/properties b/properties
index 48c1f17c..1fcb6f95 100644
--- a/properties
+++ b/properties
@@ -1,9 +1,9 @@
{
- "Email": "nataliku2@yandex.ru",
- "Name": "Test",
+ "Email": "vmk-post@yandex.ru",
+ "Name": "M",
"ServerUserPassword": "mprit_2011",
"Workspace": "E:\\Tests",
- "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
+ "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\236",
"VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
"Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java
index 91ebd853..a5fb1638 100644
--- a/src/Common/Database/Database.java
+++ b/src/Common/Database/Database.java
@@ -300,6 +300,14 @@ public abstract class Database {
}
return log.isEmpty();
}
+ public boolean canModifyCurrent(TextLog log, Class... tablesClasses) {
+ for (Class tableClass : tablesClasses) {
+ DBTable table = getTable(tableClass);
+ if (table.getUI() != null)
+ table.getUI().canModifyCurrent(log);
+ }
+ return log.isEmpty();
+ }
public abstract PassCode_ getSynchronizePassCode(); //если бд есть на сервере.
//--
public void ReplaceFileAndReconnect(File file_in) throws Exception{
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 2e715244..c4dc0234 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
import java.util.Vector;
public class Constants {
- public static final int version = 1181;
+ public static final int version = 1182;
public static final int planner_version = 10;
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
//--
diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java
index 797e0e5f..17c39347 100644
--- a/src/_VisualDVM/MainModule.java
+++ b/src/_VisualDVM/MainModule.java
@@ -33,7 +33,8 @@ public class MainModule extends MainModule_ {
PassCode.StartTestingServer,
PassCode.PublishTestingServer,
PassCode.CreateTestsGroupFromSelectedVersions,
- PassCode.RefreshDVMPackageResults
+ PassCode.RefreshDVMPackageResults,
+ PassCode.ConvertCorrectnessTests
);
public MainModule() throws Exception {
super(GlobalDatabase.class, MainUI.class);
diff --git a/src/_VisualDVM/Passes/All/CheckAccount.java b/src/_VisualDVM/Passes/All/CheckAccount.java
index 7c079b61..2fc33558 100644
--- a/src/_VisualDVM/Passes/All/CheckAccount.java
+++ b/src/_VisualDVM/Passes/All/CheckAccount.java
@@ -40,14 +40,11 @@ public class CheckAccount extends ComponentsServerPass {
if (keyFile.exists()) {
//ключ есть. проверить его актуальность.
String key = FileUtils.readFileToString(keyFile);
- System.out.println("ключ найден.");
if (SendRequest(ServerCode.GetUserAccountByKey,key)){
if (request.server_response.object!=null){
//ключ актуальный.
- System.out.println("ключ совпал");
Global.mainModule.setAccount((UserAccount) request.server_response.object);
}else {
- System.out.println("ключ не совпал!");
//ключ неактуальный. регистрируемся по новой.
UI.Error("Текущий ключ неверен. Он будет удален.");
Utils_.forceDeleteWithCheck(keyFile);
@@ -55,7 +52,6 @@ public class CheckAccount extends ComponentsServerPass {
}
}
}else {
- System.out.println("ключ не найден!");
confirmEmail();
}
return !Global.mainModule.getAccount().role.equals(AccountRole.Undefined);
diff --git a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
index e69fbac0..61e1ae03 100644
--- a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
@@ -36,10 +36,10 @@ public class ReplaceTestsFromFiles extends TestingServerPass> {
//--->>>
Utils.RestoreSelectedDirectory(fileChooser);
Vector files = fileChooser.ShowMultiDialog();
- //---------------------------------------------------------------
+ //----------------ROLE is-----------------------------------------------
//--
File dir = fileChooser.getCurrentDirectory();
- Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir);
+ Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir.getAbsolutePath());
//---------------
if (dir.getName().equals(Constants.data)) {
Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
diff --git a/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java
index 3e2ebf97..ea8d23e5 100644
--- a/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java
+++ b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java
@@ -14,7 +14,7 @@ public abstract class AbortTestingPackage extends TestingServerPass