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
2024-10-26 14:42:31 +03:00
parent a79816082a
commit c3ce2fed96
8 changed files with 111 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common/Visual/DataSetControlForm.java
View File

@@ -120,8 +120,8 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
return res;
}
protected void AddFilter(DBObjectFilter_<D> filter_in) {
allFilters.add(filter_in);
protected void AddFilters(DBObjectFilter_<D>... new_filters) {
Collections.addAll(allFilters, new_filters);
}
protected final void AddColumns(ColumnInfo<D>... new_columns) {
Collections.addAll(columns, new_columns);

2
src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
View File

@@ -58,7 +58,7 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
}
@Override
protected void createFilters() {
AddFilter(new HeaderTextFilter(dataSource, 3, 72));
AddFilters(new HeaderTextFilter(dataSource, 3, 72));
}
@Override
protected Comparator<Message> getDefaultComparator() {

2
src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
View File

@@ -34,7 +34,7 @@ public class RecommendationsForm extends DataSetControlForm<MessageRecommendatio
}
@Override
protected void createFilters() {
AddFilter(new HeaderTextFilter(dataSource, 1, 72));
AddFilters(new HeaderTextFilter(dataSource, 1, 72));
}
@Override
protected boolean hasMenuBar() {

70
src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
View File

@@ -60,42 +60,42 @@ public class GroupsForm extends DataSetControlForm<Group> {
}
@Override
protected void createFilters() {
AddFilter(new FilterFlag<Group>(dataSource, new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только группы тестов авторства пользователя");
}
}, false) {
@Override
protected boolean validate(Group object) {
return Global.mainModule.getAccount().email.equals(object.sender_address);
}
});
AddFilter(new DataSetFiltersMenu<Group>("Тип", dataSource) {
@Override
public void fill() {
for (TestType type : TestType.values())
field_filters.add(new FilterMenuFlag<Group>(dataSource, new StableMenuItem(type.getDescription()), true) {
@Override
protected boolean validate(Group object) {
return object.type.equals(type);
AddFilters(
new FilterFlag<Group>(dataSource, new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только группы тестов авторства пользователя");
}
}, false) {
@Override
protected boolean validate(Group object) {
return Global.mainModule.getAccount().email.equals(object.sender_address);
}
},
new DataSetFiltersMenu<Group>("Тип", dataSource) {
@Override
public void fill() {
for (TestType type : TestType.values())
field_filters.add(new FilterMenuFlag<Group>(dataSource, new StableMenuItem(type.getDescription()), true) {
@Override
protected boolean validate(Group object) {
return object.type.equals(type);
}
});
}
}, new DataSetFiltersMenu<Group>("Язык", dataSource) {
@Override
public void fill() {
for (LanguageName languageName : LanguageName.values()) {
field_filters.add(new FilterMenuFlag<Group>(dataSource, new StableMenuItem(languageName.getDescription()), true) {
@Override
protected boolean validate(Group object) {
return object.language.equals(languageName);
}
});
}
});
}
});
AddFilter(new DataSetFiltersMenu<Group>("Язык", dataSource) {
@Override
public void fill() {
for (LanguageName languageName : LanguageName.values()) {
field_filters.add(new FilterMenuFlag<Group>(dataSource, new StableMenuItem(languageName.getDescription()), true) {
@Override
protected boolean validate(Group object) {
return object.language.equals(languageName);
}
});
}
}
});
}
});
}
@Override
protected DBObjectDialog getDialog() {

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

@@ -140,28 +140,29 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
}
@Override
protected void createFilters() {
AddFilter(new FilterFlag<DVMPackage>(dataSource, new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
}
}, false) {
@Override
protected boolean validate(DVMPackage object) {
return Global.mainModule.getAccount().email.equals(object.sender_address);
}
});
AddFilter(new FilterFlag<DVMPackage>(dataSource, new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
}
}, false) {
@Override
protected boolean validate(DVMPackage object) {
return object.state.isActive();
}
});
AddFilters(
new FilterFlag<DVMPackage>(dataSource, new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
}
}, false) {
@Override
protected boolean validate(DVMPackage object) {
return Global.mainModule.getAccount().email.equals(object.sender_address);
}
},
new FilterFlag<DVMPackage>(dataSource, new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
}
}, false) {
@Override
protected boolean validate(DVMPackage object) {
return object.state.isActive();
}
});
}
@Override
protected Comparator<DVMPackage> getDefaultComparator() {

53
src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
View File

@@ -110,36 +110,37 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
}
@Override
protected void createFilters() {
AddFilter(new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
@Override
protected boolean validate(DVMRunTask object) {
return object.compilation_state.equals(state);
AddFilters(
new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
@Override
protected boolean validate(DVMRunTask object) {
return object.compilation_state.equals(state);
}
});
}
});
}
}
}
}
});
AddFilter(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
@Override
protected boolean validate(DVMRunTask object) {
return object.state.equals(state);
},
new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
@Override
protected boolean validate(DVMRunTask object) {
return object.state.equals(state);
}
});
}
});
}
}
}
}
});
});
}
@Override
protected Comparator<DVMRunTask> getDefaultComparator() {

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

@@ -122,27 +122,27 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
}
@Override
protected void createFilters() {
AddFilter(new FilterFlag<SapforPackage>(dataSource, new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
}
}, false) {
@Override
protected boolean validate(SapforPackage object) {
return Global.mainModule.getAccount().email.equals(object.sender_address);
}
});
AddFilter(new FilterFlag<SapforPackage>(dataSource, new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
}
}, false) {
@Override
protected boolean validate(SapforPackage object) {
return object.state.isActive();
}
});
AddFilters(new FilterFlag<SapforPackage>(dataSource, new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
}
}, false) {
@Override
protected boolean validate(SapforPackage object) {
return Global.mainModule.getAccount().email.equals(object.sender_address);
}
},
new FilterFlag<SapforPackage>(dataSource, new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
}
}, false) {
@Override
protected boolean validate(SapforPackage object) {
return object.state.isActive();
}
});
}
}