поле запаковки в json данных о файлах теста
This commit is contained in:
8
.idea/workspace.xml
generated
8
.idea/workspace.xml
generated
@@ -7,9 +7,13 @@
|
|||||||
</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/_VisualDVM/ServerObjectsCache/TestCache.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestsFilesJson.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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.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" />
|
||||||
|
|||||||
13
src/_VisualDVM/ServerObjectsCache/TestCache.java
Normal file
13
src/_VisualDVM/ServerObjectsCache/TestCache.java
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
package _VisualDVM.ServerObjectsCache;
|
||||||
|
import Common.Utils.Utils_;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Test.Json.TestsFilesJson;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
|
|
||||||
|
import java.util.Vector;
|
||||||
|
public class TestCache extends VisualCache{
|
||||||
|
public String srcNames="";
|
||||||
|
public TestCache(Test object) {
|
||||||
|
Vector<String> names=new Vector<>();
|
||||||
|
TestsFilesJson json = Utils_.gson.fromJson(object.packedFilesJson, TestsFilesJson.class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package _VisualDVM.ServerObjectsCache;
|
package _VisualDVM.ServerObjectsCache;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
|
import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
|
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
|
||||||
@@ -31,6 +32,7 @@ public class VisualCaches {
|
|||||||
if (object instanceof DVMConfiguration) return new DVMConfigurationCache((Configuration) object);
|
if (object instanceof DVMConfiguration) return new DVMConfigurationCache((Configuration) object);
|
||||||
if (object instanceof TestingPackage) return new PackageCache((TestingPackage) object);
|
if (object instanceof TestingPackage) return new PackageCache((TestingPackage) object);
|
||||||
if (object instanceof DVMSettings) return new DVMSettingsCache((DVMSettings) object);
|
if (object instanceof DVMSettings) return new DVMSettingsCache((DVMSettings) object);
|
||||||
|
if (object instanceof Test) return new TestCache((Test)object);
|
||||||
return new VisualCache();
|
return new VisualCache();
|
||||||
}
|
}
|
||||||
public static VisualCache GetCache(DBObject object) {
|
public static VisualCache GetCache(DBObject object) {
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package _VisualDVM.TestingSystem.Common.Test.Json;
|
||||||
|
import _VisualDVM.ProjectData.Files.FileType;
|
||||||
|
import _VisualDVM.ProjectData.Files.LanguageStyle;
|
||||||
|
import _VisualDVM.ProjectData.LanguageName;
|
||||||
|
import com.google.gson.annotations.Expose;
|
||||||
|
public class TestFileJson {
|
||||||
|
@Expose
|
||||||
|
public String name="";
|
||||||
|
@Expose
|
||||||
|
public FileType type = FileType.none;
|
||||||
|
@Expose
|
||||||
|
public LanguageName language = LanguageName.n;
|
||||||
|
@Expose
|
||||||
|
public LanguageStyle style = LanguageStyle.none;
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package _VisualDVM.TestingSystem.Common.Test.Json;
|
||||||
|
import com.google.gson.annotations.Expose;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Vector;
|
||||||
|
public class TestsFilesJson {
|
||||||
|
@Expose
|
||||||
|
public List<TestFileJson> values = new Vector<>();
|
||||||
|
}
|
||||||
@@ -31,6 +31,8 @@ public class Test extends riDBObject {
|
|||||||
public String files = ""; //файлы теста
|
public String files = ""; //файлы теста
|
||||||
@Description("DEFAULT ''")
|
@Description("DEFAULT ''")
|
||||||
public String extended_description="";
|
public String extended_description="";
|
||||||
|
@Description("DEFAULT ''")
|
||||||
|
public String packedFilesJson = "";
|
||||||
//--------------------------------------------->>>
|
//--------------------------------------------->>>
|
||||||
@Description("IGNORE")
|
@Description("IGNORE")
|
||||||
public String temp_project_name = "";
|
public String temp_project_name = "";
|
||||||
@@ -51,6 +53,7 @@ public class Test extends riDBObject {
|
|||||||
args = t.args;
|
args = t.args;
|
||||||
group_id = t.group_id;
|
group_id = t.group_id;
|
||||||
extended_description = t.extended_description;
|
extended_description = t.extended_description;
|
||||||
|
packedFilesJson=t.packedFilesJson;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void select(boolean flag) {
|
public void select(boolean flag) {
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import Common.Visual.Tables.RendererLongCell;
|
|||||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
|
import _VisualDVM.ServerObjectsCache.TestCache;
|
||||||
|
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
|
|
||||||
@@ -45,7 +47,7 @@ public class TestsForm extends DataSetControlForm<Test> {
|
|||||||
new ColumnInfo<Test>("файлы") {
|
new ColumnInfo<Test>("файлы") {
|
||||||
@Override
|
@Override
|
||||||
public Object getFieldAt(Test object) {
|
public Object getFieldAt(Test object) {
|
||||||
return object.getFilesForTable();
|
return ((TestCache)VisualCaches.GetCache(object)).srcNames;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user