промежуточный. в процессе продолжение рефакторинга фильтра

This commit is contained in:
2024-10-20 16:01:09 +03:00
parent f13a9cda2e
commit ffb719cbb5
12 changed files with 62 additions and 116 deletions

View File

@@ -1,4 +1,5 @@
package _VisualDVM.ProjectData.Messages.Warnings;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Messages.Message;
public class MessageWarning extends Message {
public static String filterValue = "";
@@ -7,8 +8,9 @@ public class MessageWarning extends Message {
}
public MessageWarning() {
}
@Override
public boolean isVisible() {
return super.isVisible() && value.contains(filterValue);
return super.isVisible() && Global.mainModule.getProject().db.warnings.getUI().ApplyFilters(this);
}
}

View File

@@ -1,6 +1,9 @@
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;
@@ -20,16 +23,21 @@ public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel){
return new MessagesControlForm(this,mountPanel){
@Override
public void changeHeaderFilterValue(int columnIndex, String text) {
if (columnIndex == 3)
MessageWarning.filterValue = text;
protected void createFilters() {
super.createFilters();
headersTextFilters.put(3, new HeaderTextFilter(dataSource, 3));
}
@Override
public Object getHeaderFilterValue(int columnIndex) {
return MessageWarning.filterValue;
}
public boolean ApplyFilters(DBObject object) {
if (super.ApplyFilters(object)){
System.out.println("apply warnings tet filter for message "+object.getPK());
Message message = (MessageWarning)object;
return message.value.contains(headersTextFilters.get(3).getFilterValue());
}
return false;
};
};
}
}