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

28
.idea/workspace.xml generated
View File

@@ -7,16 +7,20 @@
</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/Common/Visual/DBObjectFilterInterface.java" 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/Common/Visual/Tables/HeaderTextFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HeaderTextFilter.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/MessageError.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/MessageError.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/DBObjectFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/FilterFlagMenuItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/MessageNote.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/MessageNote.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetFiltersMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFiltersMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/MessageWarning.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/MessageWarning.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -38,8 +42,8 @@
<list> <list>
<option value="FxmlFile" /> <option value="FxmlFile" />
<option value="Enum" /> <option value="Enum" />
<option value="Interface" />
<option value="Class" /> <option value="Class" />
<option value="Interface" />
</list> </list>
</option> </option>
</component> </component>
@@ -115,11 +119,11 @@
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
</key> </key>
<key name="MoveMembersDialog.RECENTS_KEY"> <key name="MoveMembersDialog.RECENTS_KEY">
<recent name="_VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm" />
<recent name="_VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm" />
<recent name="_VisualDVM.TestingSystem.Common.Group.UI.GroupsForm" />
<recent name="Common.CommonConstants" /> <recent name="Common.CommonConstants" />
<recent name="Common.MainModule_" /> <recent name="Common.MainModule_" />
<recent name="_VisualDVM.ProjectData.Files.UI.Editor.SPFEditor" />
<recent name="_VisualDVM.Repository.Component.Sapfor.Sapfor" />
<recent name="Common.Visual.UI_" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\GlobalData\FileObject\UI" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\GlobalData\FileObject\UI" />

5
src/Common/Database/Tables/DataSet.java
View File

@@ -27,7 +27,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
d = d_in; d = d_in;
Name = d.getSimpleName(); Name = d.getSimpleName();
} }
public DataSetControlForm getUI() { public DataSetControlForm<D> getUI() {
return ui; return ui;
} }
public void mountUI(JPanel mountPanel_in) { public void mountUI(JPanel mountPanel_in) {
@@ -114,9 +114,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public D get(Object key) { public D get(Object key) {
return Data.get(key); return Data.get(key);
} }
//public Object getFieldAt(D object, int columnIndex) {
// return null;
// }
public void clear() { public void clear() {
Data.clear(); Data.clear();
} }

6
src/Common/Visual/DBObjectFilterInterface.java Normal file
View File

@@ -0,0 +1,6 @@
package Common.Visual;
import Common.Database.Objects.DBObject;
public interface DBObjectFilterInterface<D extends DBObject> {
boolean Validate(D dbObject);
//-------
}

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

@@ -34,6 +34,8 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
protected Vector<DataSetFiltersMenu> filtersMenus = new Vector<>(); //выпадающие меню фильтрации protected Vector<DataSetFiltersMenu> filtersMenus = new Vector<>(); //выпадающие меню фильтрации
protected LinkedHashMap<Integer, HeaderTextFilter> headersTextFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов protected LinkedHashMap<Integer, HeaderTextFilter> headersTextFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
//фильтры и подсчеты. todo слить с баром (?) //фильтры и подсчеты. todo слить с баром (?)
MatchesCounter f_ui = null; MatchesCounter f_ui = null;
//-- //--
@@ -60,7 +62,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
//-- //--
if (!filtersMenus.isEmpty()) { if (!filtersMenus.isEmpty()) {
for (DataSetFiltersMenu filter : filtersMenus) for (DataSetFiltersMenu filter : filtersMenus)
bar.addMenus(filter.getMenu()); bar.addMenus(filter);
} }
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();

33
src/Common/Visual/DataSetFiltersMenu.java
View File

@@ -7,21 +7,20 @@ import Common.Visual.Menus.VisualiserMenu;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.Vector; import java.util.Vector;
public abstract class DataSetFiltersMenu<D extends DBObject> { public abstract class DataSetFiltersMenu<D extends DBObject> extends VisualiserMenu implements DBObjectFilterInterface<D> {
//-- //--
protected DataSet<?, D> dataSet; protected DataSet<?, D> dataSet;
protected Vector<DBObjectFilter<D>> field_filters; protected Vector<FilterFlagMenuItem<D>> field_filters;
VisualiserMenu menu = null;
public DataSetFiltersMenu(String name, DataSet dataSet_in) { public DataSetFiltersMenu(String name, DataSet dataSet_in) {
super(name, "/Common/icons/Filter.png", true);
dataSet = dataSet_in; dataSet = dataSet_in;
menu = new VisualiserMenu(name, "/Common/icons/Filter.png", true);
field_filters = new Vector<>(); field_filters = new Vector<>();
fill(); fill();
//- //-
for (DBObjectFilter<D> filter : field_filters) for (FilterFlagMenuItem<D> filter : field_filters)
menu.add(filter.menuItem); add(filter.menuItem);
menu.addSeparator(); addSeparator();
menu.add(new StableMenuItem("Выбрать всё", "/Common/icons/SelectAll.png") { add(new StableMenuItem("Выбрать всё", "/Common/icons/SelectAll.png") {
{ {
addActionListener(new ActionListener() { addActionListener(new ActionListener() {
@Override @Override
@@ -32,7 +31,7 @@ public abstract class DataSetFiltersMenu<D extends DBObject> {
}); });
} }
}); });
menu.add(new StableMenuItem("Отменить всё", "/Common/icons/UnselectAll.png") { add(new StableMenuItem("Отменить всё", "/Common/icons/UnselectAll.png") {
{ {
addActionListener(new ActionListener() { addActionListener(new ActionListener() {
@Override @Override
@@ -44,38 +43,36 @@ public abstract class DataSetFiltersMenu<D extends DBObject> {
} }
}); });
} }
public VisualiserMenu getMenu() {
return menu;
}
void selectAll(boolean flag) { void selectAll(boolean flag) {
for (DBObjectFilter filter : field_filters) for (FilterFlagMenuItem filter : field_filters)
filter.setActive(flag); filter.setActive(flag);
} }
public abstract void fill(); public abstract void fill();
public void Drop() { public void Drop() {
for (DBObjectFilter<D> filter : field_filters) for (FilterFlagMenuItem<D> filter : field_filters)
filter.Drop(); filter.Drop();
} }
public void Refresh() { public void Refresh() {
for (DBObjectFilter<D> filter : field_filters) for (FilterFlagMenuItem<D> filter : field_filters)
filter.Refresh(); filter.Refresh();
} }
public boolean isActive() { public boolean isActive() {
for (DBObjectFilter<D> filter : field_filters) { for (FilterFlagMenuItem<D> filter : field_filters) {
if (filter.isActive()) if (filter.isActive())
return true; return true;
} }
return false; return false;
} }
@Override
public boolean Validate(D object) { public boolean Validate(D object) {
if (!isActive()) { if (!isActive()) {
//считаем без учета результатов //считаем без учета результатов
for (DBObjectFilter<D> filter : field_filters) for (FilterFlagMenuItem<D> filter : field_filters)
filter.Validate(object); filter.Validate(object);
return true; return true;
} }
boolean res = false; boolean res = false;
for (DBObjectFilter<D> filter : field_filters) for (FilterFlagMenuItem<D> filter : field_filters)
if (filter.Validate(object)) if (filter.Validate(object))
res |= true; res |= true;
return res; return res;

7
src/Common/Visual/DBObjectFilter.java → src/Common/Visual/FilterFlagMenuItem.java
View File

@@ -6,13 +6,13 @@ import Common.Visual.Controls.StableMenuItem;
import javax.swing.*; import javax.swing.*;
//одиночный фильтр, пункт фильтрационного меню. //одиночный фильтр, пункт фильтрационного меню.
public abstract class DBObjectFilter<D extends DBObject> { public abstract class FilterFlagMenuItem<D extends DBObject> implements DBObjectFilterInterface<D>{
public JMenuItem menuItem; //пункт меню фильтра. ( возможно потом сделать и кнопку) public JMenuItem menuItem; //пункт меню фильтра. ( возможно потом сделать и кнопку)
//-- //--
String description; String description;
boolean active = true; //включен ли фильтр boolean active = true; //включен ли фильтр
int count = 0; int count = 0;
public DBObjectFilter(DataSet dataSet, String description_in, boolean active_in) { public FilterFlagMenuItem(DataSet dataSet, String description_in, boolean active_in) {
menuItem = new StableMenuItem((description = description_in) + " (0)"); menuItem = new StableMenuItem((description = description_in) + " (0)");
active = active_in; active = active_in;
menuItem.addActionListener(e -> { menuItem.addActionListener(e -> {
@@ -22,7 +22,7 @@ public abstract class DBObjectFilter<D extends DBObject> {
}); });
Mark(); Mark();
} }
public DBObjectFilter(DataSet dataSet, String description_in) { public FilterFlagMenuItem(DataSet dataSet, String description_in) {
this(dataSet, description_in, true); this(dataSet, description_in, true);
} }
//-- //--
@@ -36,6 +36,7 @@ public abstract class DBObjectFilter<D extends DBObject> {
menuItem.setIcon(Utils_.getIcon(active ? getActiveIconPath() : getNotActiveIconPath())); menuItem.setIcon(Utils_.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
} }
//------- //-------
@Override
public boolean Validate(D object) { public boolean Validate(D object) {
boolean valid = validate(object); boolean valid = validate(object);
if (valid) if (valid)

1
src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -20,7 +20,6 @@ import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
//- //-
public class GroupsDBTable extends iDBTable<Group> { public class GroupsDBTable extends iDBTable<Group> {
public static boolean filterMyOnly = false;
public GroupsDBTable() { public GroupsDBTable() {
super(Group.class); super(Group.class);
} }

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

@@ -2,20 +2,19 @@ package _VisualDVM.TestingSystem.Common.Group.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton; import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DBObjectFilter; import Common.Visual.FilterFlagMenuItem;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFiltersMenu; import Common.Visual.DataSetFiltersMenu;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.HeaderTextFilter;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
import _VisualDVM.TestingSystem.Common.Test.TestType; import _VisualDVM.TestingSystem.Common.Test.TestType;
import javax.swing.*; import javax.swing.*;
public class GroupsForm extends DataSetControlForm<Group> { public class GroupsForm extends DataSetControlForm<Group> {
public static boolean filterMyOnly = false;
public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) { public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@@ -50,7 +49,7 @@ public class GroupsForm extends DataSetControlForm<Group> {
@Override @Override
public boolean isObjectVisible(Group object) { public boolean isObjectVisible(Group object) {
return super.isObjectVisible(object) && return super.isObjectVisible(object) &&
(!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) && (!filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
Global.testingServer.db.groups.getUI().ApplyFilters(object); Global.testingServer.db.groups.getUI().ApplyFilters(object);
} }
@Override @Override
@@ -68,13 +67,13 @@ public class GroupsForm extends DataSetControlForm<Group> {
setToolTipText("Отображать только группы тестов авторства пользователя"); setToolTipText("Отображать только группы тестов авторства пользователя");
Mark(); Mark();
addActionListener(e -> { addActionListener(e -> {
GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly; filterMyOnly = !filterMyOnly;
Mark(); Mark();
Global.testingServer.db.groups.ShowUI(); Global.testingServer.db.groups.ShowUI();
}); });
} }
public void Mark() { public void Mark() {
setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png")); setIcon(Utils_.getIcon(filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
} }
}); });
} }
@@ -86,7 +85,7 @@ public class GroupsForm extends DataSetControlForm<Group> {
@Override @Override
public void fill() { public void fill() {
for (TestType type : TestType.values()) for (TestType type : TestType.values())
field_filters.add(new Common.Visual.DBObjectFilter<Group>(dataSet, type.getDescription()) { field_filters.add(new FilterFlagMenuItem<Group>(dataSet, type.getDescription()) {
@Override @Override
protected boolean validate(Group object) { protected boolean validate(Group object) {
return object.type.equals(type); return object.type.equals(type);
@@ -98,7 +97,7 @@ public class GroupsForm extends DataSetControlForm<Group> {
@Override @Override
public void fill() { public void fill() {
for (LanguageName languageName : LanguageName.values()) { for (LanguageName languageName : LanguageName.values()) {
field_filters.add(new DBObjectFilter<Group>(dataSet, languageName.getDescription()) { field_filters.add(new FilterFlagMenuItem<Group>(dataSet, languageName.getDescription()) {
@Override @Override
protected boolean validate(Group object) { protected boolean validate(Group object) {
return object.language.equals(languageName); return object.language.equals(languageName);

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

@@ -8,8 +8,6 @@ import _VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm;
import javax.swing.*; import javax.swing.*;
public class DVMPackageDBTable extends iDBTable<DVMPackage> { public class DVMPackageDBTable extends iDBTable<DVMPackage> {
public static boolean filterMyOnly = false;
public static boolean filterActive = false;
public DVMPackageDBTable() { public DVMPackageDBTable() {
super(DVMPackage.class); 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.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import javax.swing.*; import javax.swing.*;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date; import java.util.Date;
public class DVMPackagesForm extends DataSetControlForm<DVMPackage> { 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) { public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@@ -116,13 +117,13 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
setToolTipText("Отображать только пакеты тестов авторства пользователя"); setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark(); Mark();
addActionListener(e -> { addActionListener(e -> {
DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly; filterMyOnly = !filterMyOnly;
Mark(); Mark();
Global.testingServer.db.dvmPackages.ShowUI(); Global.testingServer.db.dvmPackages.ShowUI();
}); });
} }
public void Mark() { 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() { add(new MenuBarButton() {
@@ -131,13 +132,13 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
setToolTipText("Отображать только активные пакеты тестов"); setToolTipText("Отображать только активные пакеты тестов");
Mark(); Mark();
addActionListener(e -> { addActionListener(e -> {
DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive; filterActive = !filterActive;
Mark(); Mark();
Global.testingServer.db.dvmPackages.ShowUI(); Global.testingServer.db.dvmPackages.ShowUI();
}); });
} }
public void Mark() { 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 @Override
public boolean isObjectVisible(DVMPackage object) { public boolean isObjectVisible(DVMPackage object) {
return super.isObjectVisible(object) && (!DVMPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) && return super.isObjectVisible(object) && (!filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
(!DVMPackageDBTable.filterActive || object.state.isActive()); (!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; package _VisualDVM.TestingSystem.DVM.DVMTasks.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DBObjectFilter; import Common.Visual.FilterFlagMenuItem;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFiltersMenu; import Common.Visual.DataSetFiltersMenu;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
@@ -86,7 +86,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
public void fill() { public void fill() {
for (TaskState state : TaskState.values()) { for (TaskState state : TaskState.values()) {
if (state.isVisible()) { if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) { field_filters.add(new FilterFlagMenuItem<DVMRunTask>(dataSet, state.getDescription()) {
@Override @Override
protected boolean validate(DVMRunTask object) { protected boolean validate(DVMRunTask object) {
return object.compilation_state.equals(state); return object.compilation_state.equals(state);
@@ -101,7 +101,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
public void fill() { public void fill() {
for (TaskState state : TaskState.values()) { for (TaskState state : TaskState.values()) {
if (state.isVisible()) { if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) { field_filters.add(new FilterFlagMenuItem<DVMRunTask>(dataSet, state.getDescription()) {
@Override @Override
protected boolean validate(DVMRunTask object) { protected boolean validate(DVMRunTask object) {
return object.state.equals(state); return object.state.equals(state);

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

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

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

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