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

Отображение списка конфигураций пакета

Browse Source
This commit is contained in:
02090095
2024-06-06 22:55:20 +03:00
parent ba6257cd36
commit 07c479ad2b
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/workspace.xml generated
View File

@@ -7,12 +7,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_RenameIncludes.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_InsertImplicitNone.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_RenameIncludes.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />

2
src/Repository/Component/Sapfor/Sapfor.java
View File

@@ -381,7 +381,7 @@ public abstract class Sapfor extends OSDComponent {
res.add(PassCode_2021.SPF_RemoveOmpDirectives);//+
res.add(PassCode_2021.SPF_RemoveComments);//+
res.add(PassCode_2021.SPF_RemoveDeadCode);//+
res.add(PassCode_2021.SPF_RenameIncludes);
res.add(PassCode_2021.SPF_InsertIncludesPass);//+
//--
res.add(PassCode_2021.SPF_LoopEndDoConverterPass); //+

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

14
src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -3,7 +3,10 @@ import Common.Current;
import Common.Database.iDBTable;
import Common.UI.DataSetControlForm;
import javax.security.auth.login.CredentialNotFoundException;
import java.util.Arrays;
import java.util.Date;
import java.util.Vector;
import static Common.UI.Tables.TableRenderers.*;
public class SapforPackageDBTable extends iDBTable<SapforPackage> {
@@ -34,8 +37,9 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
protected void AdditionalInitColumns() {
// columns.get(0).setVisible(false);
columns.get(4).setVisible(false);
columns.get(5).setVisible(false);
// columns.get(4).setMaxWidth(200);
// columns.get(5).setVisible(false);
columns.get(5).setRenderer(RendererMultiline);
columns.get(4).setMaxWidth(200);
columns.get(8).setRenderer(RendererProgress);
columns.get(9).setRenderer(RendererDate);
columns.get(10).setRenderer(RendererDate);
@@ -58,6 +62,10 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
"Статус"
};
}
public static Vector<String> getConfigurationsNames(SapforPackage object){
String[] data = object.configurationsNames.split(";");
return new Vector<String>(Arrays.asList(data));
}
@Override
public Object getFieldAt(SapforPackage object, int columnIndex) {
switch (columnIndex) {
@@ -68,7 +76,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
case 4:
return object.testsNames;
case 5:
return object.configurationsNames;
return getConfigurationsNames(object);//object.configurationsNames;
case 6:
return object.tasksCount;
case 7:

3
src/Visual_DVM_2021/Passes/PassCode_2021.java
View File

@@ -926,6 +926,9 @@ public enum PassCode_2021 {
case SPF_CorrectCodeStylePass: //+
name = "CORRECT_CODE_STYLE";
break;
case SPF_RenameIncludes:
name = "RENAME_INLCUDES";
break;
//--
case SPF_RemoveDvmDirectives: //+
name = "REMOVE_DVM_DIRS";