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-22 13:00:11 +03:00
parent 348b7602ff
commit b696af952f
14 changed files with 47 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/workspace.xml generated
View File

@@ -8,13 +8,6 @@
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/Common/Visual/DataSetFiltersMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFiltersMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/FilterFlag.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/FilterFlag.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/FilterFlagMenuItem.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/MenuButtonFilterFlag.java" beforeDir="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/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

6
src/Common/Visual/DBObjectFilter_.java
View File

@@ -2,7 +2,9 @@ package Common.Visual;
import Common.Database.Objects.DBObject;
public interface DBObjectFilter_<D extends DBObject> {
boolean Validate(D dbObject);
default void DropMatchesCount(){}
default void ShowMatchesCount(){}
default void DropMatchesCount() {
}
default void ShowMatchesCount() {
}
//-------
}

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

@@ -7,7 +7,6 @@ import Common.Database.Tables.DataSet;
import Common.Database.Tables.FKBehaviour;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.*;
@@ -34,19 +33,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
//-
protected Vector<DBObjectFilter_<D>> allFilters = new Vector<>();
<M> Vector<M> getFilters(Class<M> f){
Vector<M> res = new Vector<>();
for (DBObjectFilter_ filter_: allFilters){
//либо М, либо наследует от М
if (filter_.getClass().equals(f)||filter_.getClass().getSuperclass().equals(f)){
res.add((M) filter_);
}
}
return res;
}
public void AddFilter(DBObjectFilter_<D> filter_in){
allFilters.add(filter_in);
}
//---
//фильтры и подсчеты. todo слить с баром (?)
MatchesCounter counter_ui = null;
@@ -85,7 +71,20 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
ex.printStackTrace();
}
}
System.out.println("found "+allFilters.size()+" filters for ui "+this.getClass().getSimpleName());
System.out.println("found " + allFilters.size() + " filters for ui " + this.getClass().getSimpleName());
}
<M> Vector<M> getFilters(Class<M> f) {
Vector<M> res = new Vector<>();
for (DBObjectFilter_ filter_ : allFilters) {
//либо М, либо наследует от М
if (filter_.getClass().equals(f) || filter_.getClass().getSuperclass().equals(f)) {
res.add((M) filter_);
}
}
return res;
}
public void AddFilter(DBObjectFilter_<D> filter_in) {
allFilters.add(filter_in);
}
public ColumnInfo getColumnInfo(int i) {
return columns.get(i);
@@ -347,7 +346,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected void createFilters() {
}
protected boolean ApplyFilters(D object) {
for (DBObjectFilter_ filterInterface: allFilters){
for (DBObjectFilter_ filterInterface : allFilters) {
if (!filterInterface.Validate(object)) //??
return false;
}

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

@@ -59,7 +59,6 @@ public abstract class DataSetFiltersMenu<D extends DBObject> extends VisualiserM
return res;
}
//-------
void selectAll(boolean flag) {
for (FilterFlag filter : field_filters)
filter.setActive(flag);

23
src/Common/Visual/FilterFlag.java
View File

@@ -9,16 +9,10 @@ import javax.swing.*;
//фильтр флаг. либо в меню, либо на баре. текста нет.
public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<D> {
protected AbstractButton control = null;
String description; //описание фильтра
protected boolean active = true; //включен ли фильтр
int count = 0;
protected DataSet<?, D> dataSet = null; ///источник данных
protected String getNotActiveIconPath() {
return "/Common/icons/NotPick.png";
}
protected String getActiveIconPath() {
return "/Common/icons/Pick.png";
}
String description; //описание фильтра
int count = 0;
public FilterFlag(DataSet<?, D> dataSet_in, AbstractButton control_in, boolean active_in) {
dataSet = dataSet_in;
active = active_in;
@@ -26,14 +20,22 @@ public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<
description = control.getText();
control.addActionListener(e -> {
active = !active;
System.out.println("active="+active);
System.out.println("active=" + active);
Mark();
dataSet.ShowUI();
});
Mark();
control.setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
}
public AbstractButton getControl(){return control;}
protected String getNotActiveIconPath() {
return "/Common/icons/NotPick.png";
}
protected String getActiveIconPath() {
return "/Common/icons/Pick.png";
}
public AbstractButton getControl() {
return control;
}
public void Mark() {
control.setIcon(Utils_.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
}
@@ -56,5 +58,4 @@ public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<
public void DropMatchesCount() {
count = 0;
}
}

2
src/Common/Visual/FilterMenuFlag.java
View File

@@ -4,7 +4,7 @@ import Common.Database.Tables.DataSet;
import Common.Utils.Utils_;
import javax.swing.*;
public abstract class FilterMenuFlag<D extends DBObject> extends FilterFlag<D>{
public abstract class FilterMenuFlag<D extends DBObject> extends FilterFlag<D> {
public FilterMenuFlag(DataSet<?, D> dataSet_in, AbstractButton control_in, boolean active_in) {
super(dataSet_in, control_in, active_in);
}

4
src/Common/Visual/Tables/HeaderTextFilter.java
View File

@@ -19,12 +19,12 @@ public class HeaderTextFilter<D extends DBObject> implements DBObjectFilter_<D>
JTextField textField = null;
JPopupMenu popup = null;
private String filterValue = "";
private int offset=0;
private int offset = 0;
//при одиночном клике, показать поверх заголовка столбца выпавшее меню с полем фильтра.
public HeaderTextFilter(DataSet dataSet_in, int columnIndex_in, int offset_in) {
dataSet = dataSet_in;
columnIndex = columnIndex_in;
offset=offset_in;
offset = offset_in;
}
@Override
public boolean Validate(D object) {

1
src/_VisualDVM/GlobalData/DVMParameter/DVMParameter.java
View File

@@ -5,5 +5,4 @@ public class DVMParameter extends EnvironmentValue {
public String toString() {
return name + "=" + value + ";";
}
}

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

@@ -62,7 +62,7 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
}
@Override
public boolean isObjectVisible(Message object) {
if (super.isObjectVisible(object)){
if (super.isObjectVisible(object)) {
if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(object.file)) {
Object o = Global.mainModule.get(Current.FileGraphElement);
return !(o instanceof FileObjectWithMessages) || ((FileObjectWithMessages) o).HasMessage(object);

7
src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java
View File

@@ -1,13 +1,6 @@
package _VisualDVM.ProjectData.Messages.Warnings;
import Common.Database.Objects.DBObject;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.HeaderTextFilter;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.Message;
import _VisualDVM.ProjectData.Messages.MessagesControlForm;
import _VisualDVM.ProjectData.Messages.MessagesDBTable;
import javax.swing.*;
public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
//https://stackoverflow.com/questions/13079777/editable-jtableheader
public WarningsDBTable() {

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

@@ -6,7 +6,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.FilterFlag;
import Common.Visual.FilterMenuFlag;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;

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

@@ -1,10 +1,8 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage.UI;
import Common.Database.Tables.DataSet;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline;
@@ -14,8 +12,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import javax.swing.*;
@@ -116,7 +112,6 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
PassCode.DeleteDVMPackage);
}
};
}
@Override
protected void createFilters() {

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

@@ -3,7 +3,6 @@ import Common.Database.Tables.DataSet;
import Common.Visual.Controls.StableMenuItem;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.FilterFlag;
import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererProgressBar;
@@ -87,7 +86,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()) , true) {
field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
@Override
protected boolean validate(DVMRunTask object) {
return object.compilation_state.equals(state);
@@ -102,7 +101,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource,new StableMenuItem(state.getDescription()),true) {
field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
@Override
protected boolean validate(DVMRunTask object) {
return object.state.equals(state);

3
src/_VisualDVM/Visual/Windows/FileForm.java
View File

@@ -10,9 +10,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.Messages.Errors.MessageError;
import _VisualDVM.ProjectData.Messages.Notes.MessageNote;
import _VisualDVM.ProjectData.Messages.Warnings.MessageWarning;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.FileArraysTree;
import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree;
import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree;