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-21 12:32:20 +03:00
parent 4999e1587f
commit 6af0df7835
13 changed files with 71 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -8,8 +8,6 @@ import _VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm;
import javax.swing.*;
public class DVMPackageDBTable extends iDBTable<DVMPackage> {
public static boolean filterMyOnly = false;
public static boolean filterActive = false;
public DVMPackageDBTable() {
super(DVMPackage.class);
}

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

@@ -13,12 +13,13 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import javax.swing.*;
import java.util.Comparator;
import java.util.Date;
public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
public static boolean filterMyOnly = false;
public static boolean filterActive = false;
public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -116,13 +117,13 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
filterMyOnly = !filterMyOnly;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
setIcon(Utils_.getIcon(filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
@@ -131,13 +132,13 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
filterActive = !filterActive;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
setIcon(Utils_.getIcon(filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
@@ -154,7 +155,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
}
@Override
public boolean isObjectVisible(DVMPackage object) {
return super.isObjectVisible(object) && (!DVMPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
(!DVMPackageDBTable.filterActive || object.state.isActive());
return super.isObjectVisible(object) && (!filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
(!filterActive || object.state.isActive());
}
}

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

@@ -1,6 +1,6 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DBObjectFilter;
import Common.Visual.FilterFlagMenuItem;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.Menus.DataMenuBar;
@@ -86,7 +86,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
field_filters.add(new FilterFlagMenuItem<DVMRunTask>(dataSet, state.getDescription()) {
@Override
protected boolean validate(DVMRunTask object) {
return object.compilation_state.equals(state);
@@ -101,7 +101,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
field_filters.add(new FilterFlagMenuItem<DVMRunTask>(dataSet, state.getDescription()) {
@Override
protected boolean validate(DVMRunTask object) {
return object.state.equals(state);