no message

This commit is contained in:
2024-10-21 12:32:20 +03:00
parent 4999e1587f
commit 6af0df7835
13 changed files with 71 additions and 68 deletions

View File

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

View File

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