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

Если с первого раза не удалось проверить регистрацию, на панели обратной связи включается кнопка повторной проверки. И так до первой успешной, после кнопка исчезнет. Добавлена новая группа сообщений.

Browse Source
This commit is contained in:
02090095
2023-10-17 19:16:59 +03:00
parent 3ff937f9a2
commit cbaa99345b
10 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/workspace.xml generated
View File

@@ -7,8 +7,16 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<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/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" 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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
src/Common/Constants.java
View File

@@ -36,6 +36,8 @@ public class Constants {
PassCode_2021.SPF_SharedMemoryParallelization,
PassCode_2021.SPF_InsertDvmhRegions
};
public static final int parser_group = -1;
public static final int compiler_group = -2;
//--
//https://losst.ru/komandy-terminala-linux
public static String[] linux_system_commands = new String[]{

6
src/ProjectData/Files/DBProjectFile.java
View File

@@ -301,11 +301,11 @@ public class DBProjectFile extends DBObject {
for (String S : nw) {
Pair<Integer, String> p = decodeParserMessage(S, name);
if (S.toLowerCase().startsWith("note")) {
father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(2, S, p.getKey(), Message.parser_group);
father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(2, S, p.getKey(), Constants.parser_group);
} else if (S.toLowerCase().startsWith("warning")) {
father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(0, S, p.getKey(), Message.parser_group);
father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(0, S, p.getKey(), Constants.parser_group);
} else if (S.toLowerCase().startsWith("error"))
father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(1, S, p.getKey(), Message.parser_group);
father.db.files.Data.get(p.getValue()).CreateAndAddNewMessage(1, S, p.getKey(), Constants.parser_group);
}
}
public void ReadParseMessages() throws Exception {

13
src/ProjectData/Messages/Message.java
View File

@@ -1,17 +1,15 @@
package ProjectData.Messages;
import Common.Constants;
import Common.Current;
import Common.Global;
import GlobalData.Settings.SettingName;
import ProjectData.SapforData.FileObject;
import ProjectData.SapforData.FileObjectWithMessages;
import Visual_DVM_2021.Passes.PassException;
import com.sun.org.glassfish.gmbal.Description;
import java.util.HashMap;
import java.util.Map;
public class Message extends FileObject {
@Description("IGNORE")
public static final int parser_group = -1;
private static HashMap<String, String> codedMessages;
private static HashMap<String, String> codedMessages2;
public int group;
@@ -24,7 +22,7 @@ public class Message extends FileObject {
file = file_in;
line = line_in;
setGroup(group_in);
if ((group == parser_group) || (Current.mode != Current.Mode.Normal)) {
if ((group == Constants.parser_group) || (Current.mode != Current.Mode.Normal)) {
value = value_in;
} else {
value = !Global.getSetting(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in);
@@ -389,7 +387,7 @@ public class Message extends FileObject {
}
} while (idx != -1);
if (sum != splited.length && !message.equals(""))
throw new PassException("Ошибка при декодировании собщений на русском языке");
throw new PassException("Ошибка при декодировании сообщений на русском языке");
idx = 0;
String result = "";
for (int z = 0; z < sum; ++z) {
@@ -425,9 +423,12 @@ public class Message extends FileObject {
case 0:
group_s += "m0000";
break;
case parser_group: //сообщения от парсера.
case Constants.parser_group: //сообщения от парсера.
group_s += "parser";
break;
case Constants.compiler_group:
group_s = "compiler";
break;
default:
group_s += group;
break;

13
src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
View File

@@ -42,19 +42,6 @@ public class PackageModeSupervisor extends ThreadsPlanner {
interruptThread.start();
}
@Override
public void Interrupt() throws Exception {
/*
System.out.println("killing " + package_json.sapfor_drv + "...");
String kill_command = Global.isWindows ? ("taskkill /FI \"IMAGENAME eq " + package_json.sapfor_drv + "\" /F /T") :
("killall -SIGKILL " + package_json.sapfor_drv);
Process killer = Runtime.getRuntime().exec(kill_command);
killer.waitFor();
System.out.println("done!");
*/
//todo для надежности сделать еще один kill с внешнего процесса.
// может быть гонка, что нить успеет запустить процесс уже после интеррупта.
}
@Override
protected void finalize() {
results_json.EndDate = new Date().getTime();
//записать результаты всех задач.

3
src/SapforTestingSystem/PerformSapforTask.java
View File

@@ -3,7 +3,6 @@ import Common.Constants;
import Common.Global;
import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import ProjectData.Files.DBProjectFile;
import ProjectData.LanguageName;
import ProjectData.Messages.Errors.MessageError;
import ProjectData.Project.db_project_info;
@@ -313,6 +312,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
}
project.CreateVisualiserData();
//---
/*
if (isTransformation && !messages.isEmpty()) {
project.Open(); //нельзя!!! сначала надо определиться с версиями. И только потом, получать файлы.
//а так же, убрать dep и txt
@@ -328,6 +328,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
project.db.Commit();
project.db.Disconnect();
}
*/
}
//-------------------------------------------------->>
@Override

4
src/TestingSystem/TestingServer.java
View File

@@ -214,10 +214,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
}
protected TestingPlanner testingPlanner = new TestingPlanner();
protected Thread testingThread = new Thread(() -> testingPlanner.Perform());
/*
protected ServerSapforTestingPlanner sapforTestingPlanner = new ServerSapforTestingPlanner();
protected Thread sapforTestingThread = new Thread(() -> sapforTestingPlanner.Perform());
*/
//------>>>
public static boolean checkTasks = false;
//--

1
src/Visual_DVM_2021/Passes/All/CheckAccount.java
View File

@@ -29,5 +29,6 @@ public class CheckAccount extends Pass_2021 {
}
if (Current.getAccount().isAdmin())
Pass_2021.passes.get(PassCode_2021.PublishComponent).setControlsVisible(true);
setControlsVisible(false); //если проверка успешна, кнопку больше не показывать.
}
}

3
src/Visual_DVM_2021/Passes/All/Precompilation.java
View File

@@ -11,7 +11,6 @@ import GlobalData.Module.Module;
import GlobalData.Settings.SettingName;
import ProjectData.Files.DBProjectFile;
import ProjectData.LanguageName;
import ProjectData.Messages.Message;
import ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassException;
@@ -157,7 +156,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
messageType = 2;
}
if (messageType != Constants.Nan) {
target.db.files.Data.get(messageFile).CreateAndAddNewMessage(messageType, String.join("\n", messageText), messageLine, Message.parser_group);
target.db.files.Data.get(messageFile).CreateAndAddNewMessage(messageType, String.join("\n", messageText), messageLine, Constants.compiler_group);
messageStarted = false;
} else {
if (!S.isEmpty())

4
src/Visual_DVM_2021/UI/Main/CallbackForm.java
View File

@@ -163,7 +163,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
Global.componentsServer.db.bugReports.mountUI(bugReportsPanel);
Global.componentsServer.db.subscribers.mountUI(subscribersPanel);
settingsTools.add(Pass_2021.passes.get(PassCode_2021.ApplyBugReportSettings).createButton());
// accountTools.add(Pass_2021.passes.get(PassCode_2021.CheckAccount).createButton());
//-
if (!Pass_2021.passes.get(PassCode_2021.CheckAccount).isDone())
accountTools.add(Pass_2021.passes.get(PassCode_2021.CheckAccount).createButton());
//--
BugReportsKeyFilter.getDocument().addDocumentListener(new DocumentListener() {
@Override