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

v++

Browse Source
This commit is contained in:
02090095
2025-02-06 22:54:06 +03:00
parent 407294c6ae
commit 7dd3069445
6 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/workspace.xml generated
View File

@@ -8,7 +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$/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> </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" />

6
properties
View File

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

2
src/_VisualDVM/Repository/Component/Visualiser.java
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 //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override @Override
public void GetVersionInfo() { public void GetVersionInfo() {
version = 1147; version = 1148;
String pattern = "MMM dd yyyy HH:mm:ss"; String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH); DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime()); date_text = df.format(getClassBuildTime());

5
src/_VisualDVM/ServerObjectsCache/PackageCache.java
View File

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

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

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

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

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