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

no message

Browse Source
This commit is contained in:
02090095
2023-11-14 23:07:49 +03:00
parent 3a175e0767
commit be1fbe3ddb
13 changed files with 30 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@@ -48,10 +48,10 @@
</file-type-list> </file-type-list>
</component> </component>
<component name="HighlightingSettingsPerFile"> <component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/src/TestingSystem/TestingServer.java" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/TestingSystem/TestingServer.java" root0="FORCE_HIGHLIGHTING" />
</component> </component>
<component name="KotlinCodeInsightWorkspaceSettings"> <component name="KotlinCodeInsightWorkspaceSettings">
<option name="optimizeImportsOnTheFly" value="true" /> <option name="optimizeImportsOnTheFly" value="true" />

2
properties
View File

@@ -25,7 +25,7 @@
"InstructionPath": "", "InstructionPath": "",
"PerformanceAnalyzerPath": "", "PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10, "ComponentsBackUpsCount": 10,
"TestingKernels": 14, "TestingKernels": 64,
"AutoCheckTesting": false, "AutoCheckTesting": false,
"CheckTestingIntervalSeconds": 15, "CheckTestingIntervalSeconds": 15,
"EmailOnTestingProgress": true "EmailOnTestingProgress": true

2
src/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 = 1026; version = 1027;
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());

12
src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -32,6 +32,10 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
return true; return true;
} }
@Override @Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public void ShowCurrentObject() throws Exception { public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject(); super.ShowCurrentObject();
// Global.db.sapforTasksPackages.ShowUI(); // Global.db.sapforTasksPackages.ShowUI();
@@ -48,8 +52,7 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
return new String[]{ return new String[]{
"имя", "имя",
"автор", "автор",
"флаги", "флаги"
"maxtime"
}; };
} }
@Override @Override
@@ -61,8 +64,6 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
return object.sender_name; return object.sender_name;
case 4: case 4:
return SapforConfigurationInterface.getFlags(object); return SapforConfigurationInterface.getFlags(object);
case 5:
return object.maxtime;
default: default:
return null; return null;
} }
@@ -90,12 +91,10 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
fields.cbKEEP_SPF_DIRECTIVES.setSelected(Result.KEEP_SPF_DIRECTIVES != 0); fields.cbKEEP_SPF_DIRECTIVES.setSelected(Result.KEEP_SPF_DIRECTIVES != 0);
fields.cbSTATIC_SHADOW_ANALYSIS.setSelected(Result.STATIC_SHADOW_ANALYSIS != 0); fields.cbSTATIC_SHADOW_ANALYSIS.setSelected(Result.STATIC_SHADOW_ANALYSIS != 0);
fields.sMAX_SHADOW_WIDTH.setValue(Result.MAX_SHADOW_WIDTH); fields.sMAX_SHADOW_WIDTH.setValue(Result.MAX_SHADOW_WIDTH);
fields.sMaxtime.setValue(Result.maxtime);
} }
@Override @Override
public void ProcessResult() { public void ProcessResult() {
Result.description = fields.tfName.getText(); Result.description = fields.tfName.getText();
Result.maxtime = (int) fields.sMaxtime.getValue();
// Result.transformations = ((StyledStringList) (fields.transformationsList)).pack(); // Result.transformations = ((StyledStringList) (fields.transformationsList)).pack();
Result.FREE_FORM = Utils.fromBoolean(fields.cbFREE_FORM.isSelected()); Result.FREE_FORM = Utils.fromBoolean(fields.cbFREE_FORM.isSelected());
Result.KEEP_DVM_DIRECTIVES = Utils.fromBoolean(fields.cbKEEP_DVM_DIRECTIVES.isSelected()); Result.KEEP_DVM_DIRECTIVES = Utils.fromBoolean(fields.cbKEEP_DVM_DIRECTIVES.isSelected());
@@ -106,7 +105,6 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
@Override @Override
public void SetReadonly() { public void SetReadonly() {
fields.tfName.setEnabled(false); fields.tfName.setEnabled(false);
fields.sMaxtime.setEnabled(false);
fields.sTransformationMaxtime.setEnabled(false); fields.sTransformationMaxtime.setEnabled(false);
} }
}; };

37
src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form
View File

@@ -8,7 +8,7 @@
<properties/> <properties/>
<border type="none"/> <border type="none"/>
<children> <children>
<grid id="d1d6e" layout-manager="GridLayoutManager" row-count="9" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="d1d6e" layout-manager="GridLayoutManager" row-count="8" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/> <margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -29,7 +29,7 @@
</component> </component>
<vspacer id="224d6"> <vspacer id="224d6">
<constraints> <constraints>
<grid row="8" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"> <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
<preferred-size width="284" height="14"/> <preferred-size width="284" height="14"/>
</grid> </grid>
</constraints> </constraints>
@@ -44,30 +44,9 @@
</constraints> </constraints>
<properties/> <properties/>
</component> </component>
<component id="3e6be" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false">
<preferred-size width="284" height="20"/>
</grid>
</constraints>
<properties>
<font name="Times New Roman" size="16" style="2"/>
<text value="макс. время прохода"/>
</properties>
</component>
<component id="db389" class="javax.swing.JSpinner" binding="sMaxtime">
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<minimum-size width="100" height="30"/>
<preferred-size width="240" height="30"/>
<maximum-size width="100" height="30"/>
</grid>
</constraints>
<properties/>
</component>
<component id="b644a" class="javax.swing.JCheckBox" binding="cbFREE_FORM"> <component id="b644a" class="javax.swing.JCheckBox" binding="cbFREE_FORM">
<constraints> <constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"> <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
<preferred-size width="284" height="25"/> <preferred-size width="284" height="25"/>
</grid> </grid>
</constraints> </constraints>
@@ -80,7 +59,7 @@
</component> </component>
<component id="7721e" class="javax.swing.JCheckBox" binding="cbKEEP_SPF_DIRECTIVES"> <component id="7721e" class="javax.swing.JCheckBox" binding="cbKEEP_SPF_DIRECTIVES">
<constraints> <constraints>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"> <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
<preferred-size width="284" height="25"/> <preferred-size width="284" height="25"/>
</grid> </grid>
</constraints> </constraints>
@@ -93,7 +72,7 @@
</component> </component>
<component id="f44c1" class="javax.swing.JLabel"> <component id="f44c1" class="javax.swing.JLabel">
<constraints> <constraints>
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="3" use-parent-layout="false"> <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="3" use-parent-layout="false">
<preferred-size width="284" height="17"/> <preferred-size width="284" height="17"/>
</grid> </grid>
</constraints> </constraints>
@@ -104,7 +83,7 @@
</component> </component>
<component id="54e77" class="javax.swing.JCheckBox" binding="cbSTATIC_SHADOW_ANALYSIS"> <component id="54e77" class="javax.swing.JCheckBox" binding="cbSTATIC_SHADOW_ANALYSIS">
<constraints> <constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"> <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
<preferred-size width="284" height="25"/> <preferred-size width="284" height="25"/>
</grid> </grid>
</constraints> </constraints>
@@ -117,7 +96,7 @@
</component> </component>
<component id="4e865" class="javax.swing.JCheckBox" binding="cbKEEP_DVM_DIRECTIVES"> <component id="4e865" class="javax.swing.JCheckBox" binding="cbKEEP_DVM_DIRECTIVES">
<constraints> <constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"> <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
<preferred-size width="284" height="25"/> <preferred-size width="284" height="25"/>
</grid> </grid>
</constraints> </constraints>
@@ -130,7 +109,7 @@
</component> </component>
<component id="14243" class="javax.swing.JSlider" binding="sMAX_SHADOW_WIDTH"> <component id="14243" class="javax.swing.JSlider" binding="sMAX_SHADOW_WIDTH">
<constraints> <constraints>
<grid row="7" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"> <grid row="6" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<minimum-size width="500" height="40"/> <minimum-size width="500" height="40"/>
<preferred-size width="500" height="40"/> <preferred-size width="500" height="40"/>
<maximum-size width="500" height="40"/> <maximum-size width="500" height="40"/>

6
src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java
View File

@@ -7,7 +7,6 @@ import java.awt.*;
public class SapforConfigurationFields implements DialogFields { public class SapforConfigurationFields implements DialogFields {
private JPanel content; private JPanel content;
public JTextField tfName; public JTextField tfName;
public JSpinner sMaxtime;
public JSpinner sTransformationMaxtime; public JSpinner sTransformationMaxtime;
public JCheckBox cbFREE_FORM; public JCheckBox cbFREE_FORM;
public JSlider sMAX_SHADOW_WIDTH; public JSlider sMAX_SHADOW_WIDTH;
@@ -23,9 +22,4 @@ public class SapforConfigurationFields implements DialogFields {
// TODO: place custom component creation code here // TODO: place custom component creation code here
tfName = new StyledTextField(); tfName = new StyledTextField();
} }
public SapforConfigurationFields(){
sMaxtime.setModel(new SpinnerNumberModel(40,
5, 3600, 1
));
}
} }

7
src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
View File

@@ -20,7 +20,12 @@ public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforCo
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI() {
return new DataSetControlForm(this); return new DataSetControlForm(this){
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
};
} }
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {

1
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
View File

@@ -30,6 +30,7 @@ public class SapforTasksPackagesDBTable extends DBTable<String, SapforTasksPacka
return new DataSetControlForm(this) { return new DataSetControlForm(this) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(5).setRenderer(RendererDate); columns.get(5).setRenderer(RendererDate);
columns.get(6).setRenderer(RendererDate); columns.get(6).setRenderer(RendererDate);
columns.get(7).setRenderer(RendererStatusEnum); columns.get(7).setRenderer(RendererStatusEnum);

2
src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java
View File

@@ -38,7 +38,7 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
return new DataSetControlForm(this) { return new DataSetControlForm(this) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
//columns.get(0).setVisible(false); columns.get(0).setVisible(false);
columns.get(2).setRenderer(TableRenderers.RendererDate); columns.get(2).setRenderer(TableRenderers.RendererDate);
} }
}; };

2
src/TestingSystem/Configuration/UI/ConfigurationDBTable.java
View File

@@ -34,7 +34,7 @@ public class ConfigurationDBTable extends DBTable<String, Configuration> {
} }
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
// columns.get(0).setVisible(false); columns.get(0).setVisible(false);
columns.get(4).setRenderer(TableRenderers.RendererMultiline); columns.get(4).setRenderer(TableRenderers.RendererMultiline);
columns.get(5).setRenderer(TableRenderers.RendererMultiline); columns.get(5).setRenderer(TableRenderers.RendererMultiline);
columns.get(12).setRenderer(TableRenderers.RendererMultiline); columns.get(12).setRenderer(TableRenderers.RendererMultiline);

2
src/TestingSystem/Group/GroupsDBTable.java
View File

@@ -122,7 +122,7 @@ public class GroupsDBTable extends DBTable<String, Group> {
} }
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
//columns.get(0).setVisible(false); columns.get(0).setVisible(false);
} }
}; };
} }

1
src/TestingSystem/TasksPackage/TasksPackageDBTable.java
View File

@@ -36,6 +36,7 @@ public class TasksPackageDBTable extends DBTable<String, TasksPackage> {
} }
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(7).setRenderer(RendererDate); columns.get(7).setRenderer(RendererDate);
columns.get(8).setRenderer(RendererDate); columns.get(8).setRenderer(RendererDate);
columns.get(9).setRenderer(RendererStatusEnum); columns.get(9).setRenderer(RendererStatusEnum);

2
src/TestingSystem/Test/TestDBTable.java
View File

@@ -21,7 +21,7 @@ public class TestDBTable extends DBTable<String, Test> {
return new DataSetControlForm(this) { return new DataSetControlForm(this) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
//columns.get(0).setVisible(false); columns.get(0).setVisible(false);
} }
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {