no message
This commit is contained in:
9
.idea/workspace.xml
generated
9
.idea/workspace.xml
generated
@@ -8,11 +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/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTestsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTestsDBTable.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" />
|
||||||
|
|||||||
@@ -582,6 +582,7 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
|
|||||||
return CheckCurrent(Log);
|
return CheckCurrent(Log);
|
||||||
}
|
}
|
||||||
public void SelectKeys(Vector<?> keys_in) {
|
public void SelectKeys(Vector<?> keys_in) {
|
||||||
|
SelectAll(false);
|
||||||
for (Object key_ : keys_in)
|
for (Object key_ : keys_in)
|
||||||
dataSource.get(key_).Select(true);
|
dataSource.get(key_).Select(true);
|
||||||
if (!keys_in.isEmpty())
|
if (!keys_in.isEmpty())
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
|
|||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class Constants {
|
public class Constants {
|
||||||
public static final int version = 1220;
|
public static final int version = 1221;
|
||||||
public static final int planner_version = 24;
|
public static final int planner_version = 24;
|
||||||
public static final int testingMaxKernels = 64;
|
public static final int testingMaxKernels = 64;
|
||||||
//--
|
//--
|
||||||
@@ -48,7 +48,7 @@ public class Constants {
|
|||||||
//
|
//
|
||||||
//7998 отладочный порт. теперь.
|
//7998 отладочный порт. теперь.
|
||||||
public static final int ComponentsServerPort = 7995; //7795
|
public static final int ComponentsServerPort = 7995; //7795
|
||||||
public static final int TestingServerPort = 7998; //7996
|
public static final int TestingServerPort = 7996; //7996
|
||||||
public static final int SocketTimeout = 0;
|
public static final int SocketTimeout = 0;
|
||||||
//-
|
//-
|
||||||
public static final String ServerAddress = "alex-freenas.ddns.net";
|
public static final String ServerAddress = "alex-freenas.ddns.net";
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegionsSet;
|
|||||||
import _VisualDVM.ProjectData.SapforData.SapforProperties;
|
import _VisualDVM.ProjectData.SapforData.SapforProperties;
|
||||||
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
|
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
|
||||||
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariantsSet;
|
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariantsSet;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.ProjectFiles_json;
|
|
||||||
import _VisualDVM.Utils;
|
import _VisualDVM.Utils;
|
||||||
import com.mxgraph.swing.mxGraphComponent;
|
import com.mxgraph.swing.mxGraphComponent;
|
||||||
import com.sun.org.glassfish.gmbal.Description;
|
import com.sun.org.glassfish.gmbal.Description;
|
||||||
@@ -1514,13 +1513,6 @@ public class db_project_info extends DBObject {
|
|||||||
for (DBProjectFile file : db.files.Data.values())
|
for (DBProjectFile file : db.files.Data.values())
|
||||||
file.Select(b);
|
file.Select(b);
|
||||||
}
|
}
|
||||||
public ProjectFiles_json filesToJson() {
|
|
||||||
ProjectFiles_json res = new ProjectFiles_json();
|
|
||||||
LinkedHashMap<LanguageName, Vector<DBProjectFile>> programs = getPrograms();
|
|
||||||
if (programs.containsKey(this.languageName))
|
|
||||||
res.files.addAll(programs.get(this.languageName));
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
public boolean hasSubdirectories() {
|
public boolean hasSubdirectories() {
|
||||||
subdirectories.clear();
|
subdirectories.clear();
|
||||||
getSubdirectoriesR(Home);
|
getSubdirectoriesR(Home);
|
||||||
|
|||||||
@@ -22,13 +22,6 @@ public class Configuration extends riDBObject {
|
|||||||
public int autoTesting = 0;
|
public int autoTesting = 0;
|
||||||
@Description("DEFAULT 1")
|
@Description("DEFAULT 1")
|
||||||
public int kernels = 1; //ядра
|
public int kernels = 1; //ядра
|
||||||
//todo ВЫВЕСТИ ПОСЛЕ ПАТЧА
|
|
||||||
/*
|
|
||||||
public String packedGroupsJson = "";
|
|
||||||
public String packedTestsJson = "";
|
|
||||||
public String packedSettingsJson = "";
|
|
||||||
*/
|
|
||||||
//todo ------------------------
|
|
||||||
@Description("DEFAULT 0")
|
@Description("DEFAULT 0")
|
||||||
public int groupsOnly = 0;
|
public int groupsOnly = 0;
|
||||||
//если флаг выставлен, то при формировании пакета берутся все тесты из участвущих групп. тесты конфигурации игнорируются.
|
//если флаг выставлен, то при формировании пакета берутся все тесты из участвущих групп. тесты конфигурации игнорируются.
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
package _VisualDVM.TestingSystem.Common.Test;
|
|
||||||
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
|
||||||
import com.google.gson.annotations.Expose;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Vector;
|
|
||||||
public class ProjectFiles_json {
|
|
||||||
@Expose
|
|
||||||
public List<DBProjectFile> files = new Vector<>();
|
|
||||||
}
|
|
||||||
@@ -10,6 +10,12 @@ import _VisualDVM.Passes.PassCode;
|
|||||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||||
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
|
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Group.Json.GroupJson;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Group.Json.GroupsJson;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsArrayJson;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Test.Json.TestJson;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Test.Json.TestsJson;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
|
import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
|
||||||
import _VisualDVM.TestingSystem.Common.TestFile.TestFile;
|
import _VisualDVM.TestingSystem.Common.TestFile.TestFile;
|
||||||
|
|||||||
Reference in New Issue
Block a user