Отображение списка конфигураций пакета
This commit is contained in:
4
.idea/workspace.xml
generated
4
.idea/workspace.xml
generated
@@ -7,12 +7,10 @@
|
|||||||
</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/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$/.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/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/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" />
|
<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>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
|
|||||||
@@ -381,7 +381,7 @@ public abstract class Sapfor extends OSDComponent {
|
|||||||
res.add(PassCode_2021.SPF_RemoveOmpDirectives);//+
|
res.add(PassCode_2021.SPF_RemoveOmpDirectives);//+
|
||||||
res.add(PassCode_2021.SPF_RemoveComments);//+
|
res.add(PassCode_2021.SPF_RemoveComments);//+
|
||||||
res.add(PassCode_2021.SPF_RemoveDeadCode);//+
|
res.add(PassCode_2021.SPF_RemoveDeadCode);//+
|
||||||
|
res.add(PassCode_2021.SPF_RenameIncludes);
|
||||||
res.add(PassCode_2021.SPF_InsertIncludesPass);//+
|
res.add(PassCode_2021.SPF_InsertIncludesPass);//+
|
||||||
//--
|
//--
|
||||||
res.add(PassCode_2021.SPF_LoopEndDoConverterPass); //+
|
res.add(PassCode_2021.SPF_LoopEndDoConverterPass); //+
|
||||||
|
|||||||
@@ -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 = 1104;
|
version = 1105;
|
||||||
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());
|
||||||
|
|||||||
@@ -3,7 +3,10 @@ import Common.Current;
|
|||||||
import Common.Database.iDBTable;
|
import Common.Database.iDBTable;
|
||||||
import Common.UI.DataSetControlForm;
|
import Common.UI.DataSetControlForm;
|
||||||
|
|
||||||
|
import javax.security.auth.login.CredentialNotFoundException;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.Vector;
|
||||||
|
|
||||||
import static Common.UI.Tables.TableRenderers.*;
|
import static Common.UI.Tables.TableRenderers.*;
|
||||||
public class SapforPackageDBTable extends iDBTable<SapforPackage> {
|
public class SapforPackageDBTable extends iDBTable<SapforPackage> {
|
||||||
@@ -34,8 +37,9 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
|
|||||||
protected void AdditionalInitColumns() {
|
protected void AdditionalInitColumns() {
|
||||||
// columns.get(0).setVisible(false);
|
// columns.get(0).setVisible(false);
|
||||||
columns.get(4).setVisible(false);
|
columns.get(4).setVisible(false);
|
||||||
columns.get(5).setVisible(false);
|
// columns.get(5).setVisible(false);
|
||||||
// columns.get(4).setMaxWidth(200);
|
columns.get(5).setRenderer(RendererMultiline);
|
||||||
|
columns.get(4).setMaxWidth(200);
|
||||||
columns.get(8).setRenderer(RendererProgress);
|
columns.get(8).setRenderer(RendererProgress);
|
||||||
columns.get(9).setRenderer(RendererDate);
|
columns.get(9).setRenderer(RendererDate);
|
||||||
columns.get(10).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
|
@Override
|
||||||
public Object getFieldAt(SapforPackage object, int columnIndex) {
|
public Object getFieldAt(SapforPackage object, int columnIndex) {
|
||||||
switch (columnIndex) {
|
switch (columnIndex) {
|
||||||
@@ -68,7 +76,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
|
|||||||
case 4:
|
case 4:
|
||||||
return object.testsNames;
|
return object.testsNames;
|
||||||
case 5:
|
case 5:
|
||||||
return object.configurationsNames;
|
return getConfigurationsNames(object);//object.configurationsNames;
|
||||||
case 6:
|
case 6:
|
||||||
return object.tasksCount;
|
return object.tasksCount;
|
||||||
case 7:
|
case 7:
|
||||||
|
|||||||
@@ -926,6 +926,9 @@ public enum PassCode_2021 {
|
|||||||
case SPF_CorrectCodeStylePass: //+
|
case SPF_CorrectCodeStylePass: //+
|
||||||
name = "CORRECT_CODE_STYLE";
|
name = "CORRECT_CODE_STYLE";
|
||||||
break;
|
break;
|
||||||
|
case SPF_RenameIncludes:
|
||||||
|
name = "RENAME_INLCUDES";
|
||||||
|
break;
|
||||||
//--
|
//--
|
||||||
case SPF_RemoveDvmDirectives: //+
|
case SPF_RemoveDvmDirectives: //+
|
||||||
name = "REMOVE_DVM_DIRS";
|
name = "REMOVE_DVM_DIRS";
|
||||||
|
|||||||
Reference in New Issue
Block a user