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

++

Browse Source 
решение проблемы совместимости с java 1.8._4xx
This commit is contained in:
02090095
2025-04-21 15:27:20 +03:00
parent e8c748eb7e
commit b37e20e4a4
71 changed files with 361 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.TestingSystem.Common;
import Common.CommonConstants;
import Common.Utils.Loggable;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
@@ -11,7 +12,6 @@ import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
import _VisualDVM.TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
import _VisualDVM.Utils;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
import java.io.File;

2
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -3,6 +3,7 @@ import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Database.RepositoryRefuseException;
import Common.Utils.Pair;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import Common.Utils.Vector_;
@@ -48,7 +49,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforTestingPlanner;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import _VisualDVM.Utils;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
import javax.swing.*;

5
src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.TestingSystem.Common;
import Common.CommonConstants;
import Common.Database.SQLITE.SQLiteDatabase;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
@@ -63,7 +64,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsComma
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -692,5 +692,6 @@ public class TestsDatabase extends SQLiteDatabase {
}
return res;
}
public void Patch() throws Exception {}
public void Patch() throws Exception {
}
}

2
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMPackage;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Constants;
@@ -25,7 +26,6 @@ import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMTask;
import _VisualDVM.Utils;
import com.sun.org.glassfish.gmbal.Description;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
import java.io.File;

2
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
View File

@@ -152,7 +152,7 @@ public class DVMPackagesForm extends RDataSetControlForm<DVMPackage> {
addPasses(PassCode.PauseDVMPackage, PassCode.ResumeDVMPackage, PassCode.AbortDVMPackage);
addSeparator();
addPasses(PassCode.DownloadDVMPackage,
// PassCode.RefreshDVMPackageResults,
// PassCode.RefreshDVMPackageResults,
PassCode.ExportDVMPackageToExcel,
PassCode.DeleteDVMPackage);
}

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

@@ -1,6 +1,7 @@
package _VisualDVM.TestingSystem.DVM;
import Common.CommonConstants;
import Common.Passes.PassException;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.GlobalData.Machine.Machine;
@@ -9,7 +10,6 @@ import _VisualDVM.GlobalData.User.User;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Utils;
import com.jcraft.jsch.*;
import javafx.util.Pair;
import java.io.*;
import java.nio.charset.StandardCharsets;

1
src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java
View File

@@ -177,7 +177,6 @@ public class SapforPackage_json implements Serializable {
}
return comparison_root.mismatches_count;
}
public void getVersionsFiles(SapforPackage package_in) {
//---
//---

2
src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java
View File

@@ -54,7 +54,7 @@ public class PackageModeSupervisor extends ThreadsPlanner {
"proj", "dep", "jar"
// ,"sh", "exe", "bat"
);
//удаление сапфора
//удаление сапфора exception
if (sapfor_drv.exists())
FileUtils.forceDelete(sapfor_drv);
} catch (Exception e) {

13
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
View File

@@ -18,7 +18,6 @@ import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import com.sun.org.glassfish.gmbal.Description;
import java.io.File;
import java.nio.file.Paths;
import java.util.Vector;
public class SapforPackage extends TestingPackage<SapforPackage_json> {
public int sapforId = CommonConstants.Nan; // так как сапфор на машине.
@@ -109,20 +108,20 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
bad++;
else good++;
//--
Vector<SapforVersion_json> all_versions= new Vector<>();
Vector<SapforVersion_json> all_versions = new Vector<>();
all_versions.addAll(task.versions);
all_versions.addAll(task.variants);
for (SapforVersion_json version_json: all_versions){
for (SapforVersion_json version_json : all_versions) {
File configurationRoot = Utils_.getFile(
getLocalWorkspace().getAbsolutePath(),
String.valueOf(task.set_id),
String.valueOf(task.sapfor_configuration_id));
getLocalWorkspace().getAbsolutePath(),
String.valueOf(task.set_id),
String.valueOf(task.sapfor_configuration_id));
version_json.getFilesAndCheckState(configurationRoot);
}
//--
}
saveJson();
state = (bad > 0) ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
state = (bad > 0) ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
double percent = (((double) (good)) / tasksCount) * 100.0;
description = "Выполнено на " + ((int) percent) + "%\n" +
"Всего задач: " + tasksCount + ", из них с ошибками " + bad;

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDatabase.java
View File

@@ -4,7 +4,6 @@ import Common.Passes.PassCode_;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
import java.io.EOFException;
import java.io.File;
public class SapforPackageDatabase extends SQLiteDatabase {
public SapforTasksDBTable tasks;
@@ -12,10 +11,10 @@ public class SapforPackageDatabase extends SQLiteDatabase {
public SapforPackageDatabase(SapforPackage sapforPackage) {
super(new File(sapforPackage.getLocalWorkspace(), "sapfor_package.db"));
}
public void convertFromJson(SapforPackage sapforPackage) throws Exception{
public void convertFromJson(SapforPackage sapforPackage) throws Exception {
sapforPackage.readJson();
BeginTransaction();
for (SapforTask sapforTask: sapforPackage.package_json.tasks)
for (SapforTask sapforTask : sapforPackage.package_json.tasks)
Insert(sapforTask);
Commit();
}

7
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
View File

@@ -4,7 +4,10 @@ import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.*;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMilliseconds;
import Common.Visual.Tables.RendererProgressBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.SapforPackageCache;
@@ -133,7 +136,7 @@ public class SapforPackagesForm extends RDataSetControlForm<SapforPackage> {
addPasses(PassCode.AbortSapforPackage);
addSeparator();
addPasses(PassCode.CompareSapforPackageToEthalon, PassCode.JoinSapforTestingVersionsToGroup
// ,PassCode.RefreshSapforPackageResults
// ,PassCode.RefreshSapforPackageResults
);
addSeparator();
addPasses(PassCode.DeleteSapforPackage);

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

@@ -1,11 +1,9 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.Utils.Utils_;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
public abstract class SapforPackageTreeNode extends DefaultMutableTreeNode {
public ImageIcon getIcon() {
// Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png");
// Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png");
ImageIcon res = new ImageIcon((getClass().getResource("/icons/versions/" + getImageKey() + ".png")));
return (getImageKey() != null) ? res : null;
}

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
View File

@@ -55,8 +55,8 @@ public class SapforTasksPackageTree extends DataTree {
if (slave_tree != null) {
slave_tree.selectSamePath(e);
slave_tree.scrollPathToVisible(slave_tree.getSelectionPath());
// System.out.println(getSelectionPath());
// System.out.println(slave_tree.slave_tree.getSelectionPath());
// System.out.println(getSelectionPath());
// System.out.println(slave_tree.slave_tree.getSelectionPath());
}
//---
if (o instanceof SapforVersion_json) {

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.TestingSystem.SAPFOR;
import Common.CommonConstants;
import Common.Utils.Pair;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
@@ -18,7 +19,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforTask.ComparisonState;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
import java.io.File;