считаывание списка файлов у коррекции стиля кода. для сравнения.
This commit is contained in:
7
.idea/workspace.xml
generated
7
.idea/workspace.xml
generated
@@ -7,16 +7,9 @@
|
|||||||
</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/SapforTestingSystem/Json/SapforTest_json.java" 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$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.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/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.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$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.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,10 +2,9 @@ package SapforTestingSystem.PackageModeSupervisor;
|
|||||||
import Common.Constants;
|
import Common.Constants;
|
||||||
import Common.Global;
|
import Common.Global;
|
||||||
import Common.Utils.Utils;
|
import Common.Utils.Utils;
|
||||||
import SapforTestingSystem.Json.SapforConfiguration_json;
|
import ProjectData.Files.DBProjectFile;
|
||||||
import SapforTestingSystem.Json.SapforTasksPackage_json;
|
import ProjectData.Files.FileType;
|
||||||
import SapforTestingSystem.Json.SapforTasksResults_json;
|
import SapforTestingSystem.Json.*;
|
||||||
import SapforTestingSystem.Json.SapforTest_json;
|
|
||||||
import SapforTestingSystem.PerformSapforTask;
|
import SapforTestingSystem.PerformSapforTask;
|
||||||
import SapforTestingSystem.SapforTask.SapforTask;
|
import SapforTestingSystem.SapforTask.SapforTask;
|
||||||
import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
|
import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
|
||||||
@@ -13,6 +12,7 @@ import org.apache.commons.io.FileUtils;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.Vector;
|
||||||
public class PackageModeSupervisor extends ThreadsPlanner {
|
public class PackageModeSupervisor extends ThreadsPlanner {
|
||||||
SapforTasksPackage_json package_json = null;
|
SapforTasksPackage_json package_json = null;
|
||||||
SapforTasksResults_json results_json = new SapforTasksResults_json();
|
SapforTasksResults_json results_json = new SapforTasksResults_json();
|
||||||
@@ -45,14 +45,45 @@ public class PackageModeSupervisor extends ThreadsPlanner {
|
|||||||
}
|
}
|
||||||
interruptThread.start();
|
interruptThread.start();
|
||||||
}
|
}
|
||||||
|
void getTaskFiles(SapforTask task) throws Exception {
|
||||||
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void finalize() {
|
protected void finalize() {
|
||||||
results_json.EndDate = new Date().getTime();
|
results_json.EndDate = new Date().getTime();
|
||||||
//записать результаты всех задач.
|
//записать результаты всех задач.
|
||||||
try {
|
try {
|
||||||
Utils.jsonToFile(results_json, new File(Global.Home, Constants.results_json));
|
//очистка служебных файлов.
|
||||||
//тут же и строить версии.
|
|
||||||
Utils.deleteFilesByExtensions(new File(Global.Home), "proj", "dep"); //Потом txt тоже добавить.
|
Utils.deleteFilesByExtensions(new File(Global.Home), "proj", "dep"); //Потом txt тоже добавить.
|
||||||
|
//--
|
||||||
|
for (SapforTask task : results_json.tasks) {
|
||||||
|
//--
|
||||||
|
task.files = new Vector<>();
|
||||||
|
//--
|
||||||
|
if (task.versions.size() > 1) {
|
||||||
|
SapforVersion_json correctness = task.versions.get(1); //0 - исходная, 1 коррекция стиля кода.
|
||||||
|
File home = new File(correctness.version);
|
||||||
|
//задача, получить список файлов. нет вложенных папок.
|
||||||
|
File[] files_ = home.listFiles();
|
||||||
|
if (files_ != null) {
|
||||||
|
for (File file : files_) {
|
||||||
|
if (file.isFile()) {
|
||||||
|
DBProjectFile pf = new DBProjectFile(); //только для определения типа файла.
|
||||||
|
pf.file = file;
|
||||||
|
pf.AutoDetectProperties();
|
||||||
|
if (pf.fileType != FileType.forbidden)
|
||||||
|
task.files.add(pf.file.getName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//--
|
||||||
|
/*
|
||||||
|
if (task.files.size() > 0) {
|
||||||
|
task.filesNames = String.join("\n", task.files);
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Utils.jsonToFile(results_json, new File(Global.Home, Constants.results_json));
|
||||||
FileUtils.writeStringToFile(new File(Constants.DONE), "");
|
FileUtils.writeStringToFile(new File(Constants.DONE), "");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Global.Log.PrintException(e);
|
Global.Log.PrintException(e);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import SapforTestingSystem.Json.SapforVersion_json;
|
|||||||
import com.google.gson.annotations.Expose;
|
import com.google.gson.annotations.Expose;
|
||||||
import com.sun.org.glassfish.gmbal.Description;
|
import com.sun.org.glassfish.gmbal.Description;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class SapforTask extends DBObject {
|
public class SapforTask extends DBObject {
|
||||||
//------------------------------------>>
|
//------------------------------------>>
|
||||||
@@ -29,14 +30,19 @@ public class SapforTask extends DBObject {
|
|||||||
@Description("DEFAULT ''")
|
@Description("DEFAULT ''")
|
||||||
@Expose
|
@Expose
|
||||||
public String root = "";
|
public String root = "";
|
||||||
@Description("DEFAULT ''")
|
|
||||||
@Expose
|
|
||||||
public String last_version = "";
|
|
||||||
//-------------------------------------->>
|
|
||||||
@Description("DEFAULT 'Inactive'")
|
@Description("DEFAULT 'Inactive'")
|
||||||
@Expose
|
@Expose
|
||||||
public TaskState state = TaskState.Inactive;
|
public TaskState state = TaskState.Inactive;
|
||||||
//-----------
|
//-----------
|
||||||
|
/*
|
||||||
|
@Description("DEFAULT ''")
|
||||||
|
@Expose
|
||||||
|
public String filesNames = ""; //для базы данных. имена файлов через enter //а надо ли?
|
||||||
|
*/
|
||||||
|
@Description("IGNORE")
|
||||||
|
@Expose
|
||||||
|
public List<String> files = new Vector<>(); //файлы проекта.Брать из коррекции стиля кода. есть первой версия
|
||||||
|
//-------------------------------------->>
|
||||||
@Description("IGNORE")
|
@Description("IGNORE")
|
||||||
@Expose
|
@Expose
|
||||||
public Vector<SapforVersion_json> versions = new Vector<>();
|
public Vector<SapforVersion_json> versions = new Vector<>();
|
||||||
|
|||||||
Reference in New Issue
Block a user