This commit is contained in:
2025-02-06 22:54:06 +03:00
parent 407294c6ae
commit 7dd3069445
6 changed files with 19 additions and 11 deletions

5
.idea/workspace.xml generated
View File

@@ -8,7 +8,10 @@
<component name="ChangeListManager">
<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$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -24,9 +24,9 @@
"CheckTestingIntervalSeconds": 10,
"AutoCheckTesting": true,
"EmailOnTestingProgress": true,
"lastMachineId": 13,
"lastUserId": 24,
"lastCompilerId": 52,
"lastMachineId": 11,
"lastUserId": -1,
"lastCompilerId": -1,
"RegisterOn": false,
"SpacesOn": false,
"EmptyLinesOn": false,

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
@Override
public void GetVersionInfo() {
version = 1147;
version = 1148;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());

View File

@@ -8,6 +8,7 @@ import java.util.Vector;
public class PackageCache extends VisualCache {
public ConfigurationsJson configurationsJson = null;
public Vector<String> configurationsDescriptions = null;
public String confifurationsDescriptionsLine= null;
public PackageCache(TestingPackage testingPackage) {
if (testingPackage.packedConfigurationsJson.isEmpty())
configurationsJson = new ConfigurationsJson(); //просто пустой
@@ -17,8 +18,12 @@ public class PackageCache extends VisualCache {
configurationsDescriptions = new Vector<>();
for (ConfigurationJson configurationJson : configurationsJson.array)
configurationsDescriptions.add(configurationJson.description);
confifurationsDescriptionsLine = String.join(";", configurationsDescriptions);
}
public Vector<String> getConfigurationsDescriptions() {
return configurationsDescriptions;
}
public String getConfifurationsDescriptionsLine(){
return confifurationsDescriptionsLine;
}
}

View File

@@ -48,11 +48,11 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
new ColumnInfo<DVMPackage>("конфигурации") {
@Override
public Object getFieldAt(DVMPackage object) {
return ((PackageCache) VisualCaches.GetCache(object)).getConfigurationsDescriptions();
return ((PackageCache) VisualCaches.GetCache(object)).getConfifurationsDescriptionsLine();
}
@Override
public Class getRendererClass() {
return RendererMultiline.class;
public int getMaxWidth() {
return 500;
}
},
new ColumnInfo<DVMPackage>("задач") {

View File

@@ -36,11 +36,11 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
new ColumnInfo<SapforPackage>("конфигурации") {
@Override
public Object getFieldAt(SapforPackage object) {
return ((PackageCache) VisualCaches.GetCache(object)).getConfigurationsDescriptions();
return ((PackageCache) VisualCaches.GetCache(object)).getConfifurationsDescriptionsLine();
}
@Override
public Class getRendererClass() {
return RendererMultiline.class;
public int getMaxWidth() {
return 500;
}
},
new ColumnInfo<SapforPackage>("задач") {