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

Исправление бага с пробелами. v++

Browse Source
This commit is contained in:
02090095
2024-03-27 00:28:04 +03:00
parent 79085ad5f8
commit cad6ea8d3b
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/workspace.xml generated
View File

@@ -8,6 +8,10 @@
<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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.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" />

2
properties
View File

@@ -13,7 +13,7 @@
"collapseCredentials": false, "collapseCredentials": false,
"collapseFileGraphs": true, "collapseFileGraphs": true,
"collapseFileMessages": true, "collapseFileMessages": true,
"collapseProjectTrees": true, "collapseProjectTrees": false,
"BackupWorkspace": "_sapfor_x64_backups", "BackupWorkspace": "_sapfor_x64_backups",
"BackupHour": 5, "BackupHour": 5,
"BackupMinute": 0, "BackupMinute": 0,

2
src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
View File

@@ -1,4 +1,5 @@
package GlobalData.Tasks.Supervisor.Remote; package GlobalData.Tasks.Supervisor.Remote;
import Common.UI.UI;
import Common.Utils.Utils; import Common.Utils.Utils;
import GlobalData.Makefile.Makefile; import GlobalData.Makefile.Makefile;
import GlobalData.RemoteFile.RemoteFile; import GlobalData.RemoteFile.RemoteFile;
@@ -29,7 +30,6 @@ public class RemoteCompilationSupervisor extends RemoteTaskSupervisor<Compilatio
} }
@Override @Override
protected void StartTask() throws Exception { protected void StartTask() throws Exception {
//UI.Info("starting task");
pass.user.connection.performScript(getRemoteProject(), getStartCommand()+" 1>PID"); pass.user.connection.performScript(getRemoteProject(), getStartCommand()+" 1>PID");
RemoteFile PID = getPID(); RemoteFile PID = getPID();
while (!pass.user.connection.Exists(PID)){ while (!pass.user.connection.Exists(PID)){

2
src/Repository/Component/Visualiser.java
View File

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override @Override
public void GetVersionInfo() { public void GetVersionInfo() {
version = 1084; version = 1085;
String pattern = "MMM dd yyyy HH:mm:ss"; String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH); DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime()); date_text = df.format(getClassBuildTime());

3
src/TestingSystem/Common/TestingPlanner.java
View File

@@ -150,8 +150,7 @@ public abstract class TestingPlanner<P extends TestingPackage> {
Print("package " + testingPackage.id + " NEEDS TO KILL"); Print("package " + testingPackage.id + " NEEDS TO KILL");
Kill(); Kill();
UpdatePackageState(TasksPackageState.Aborted); UpdatePackageState(TasksPackageState.Aborted);
ServerCommand(ServerCode.DeleteObjectByPK, ServerCommand(ServerCode.DeleteObjectByPK, new Pair(TestingPackageToKill.class, ptk_id));
new Pair(TestingPackageToKill.class, ptk_id));
} else { } else {
Session(); Session();
} }

2
src/TestingSystem/DVM/UserConnection.java
View File

@@ -237,7 +237,7 @@ public class UserConnection {
//-- //--
writeToFile("cd " + Utils.DQuotes(directory.full_name) + "\n" + String.join("\n", commands), script_file); writeToFile("cd " + Utils.DQuotes(directory.full_name) + "\n" + String.join("\n", commands), script_file);
//-- //--
ShellCommand(script_file.full_name + " 1>" + Utils.DQuotes(out.full_name) + " 2>" + Utils.DQuotes(err.full_name)); ShellCommand(Utils.DQuotes(script_file.full_name) + " 1>" + Utils.DQuotes(out.full_name) + " 2>" + Utils.DQuotes(err.full_name));
return new Pair<>(out, err); return new Pair<>(out, err);
} }
public void putResource(RemoteFile dstDirectory, String resource_name) throws Exception { public void putResource(RemoteFile dstDirectory, String resource_name) throws Exception {