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

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

@@ -18,18 +18,4 @@ public class ErrorsDBTable extends MessagesDBTable<MessageError> {
public Current CurrentName() {
return Current.Errors;
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel){
@Override
public void changeHeaderFilterValue(int columnIndex, String text) {
if (columnIndex == 3)
MessageError.filterValue = text;
}
@Override
public Object getHeaderFilterValue(int columnIndex) {
return MessageError.filterValue;
}
};
}
}

View File

@@ -10,8 +10,10 @@ public class MessageError extends Message {
}
public MessageError() {
}
/*
@Override
public boolean isVisible() {
return super.isVisible() && value.contains(filterValue);
}
*/
}

View File

@@ -445,12 +445,18 @@ public class Message extends FileObject {
break;
}
}
@Override
public boolean isVisible() {
return true;
/*
if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(file)) {
Object o = Global.mainModule.get(Current.FileGraphElement);
return !(o instanceof FileObjectWithMessages) || ((FileObjectWithMessages) o).HasMessage(this);
} else return false;
*/
}
@Override
public Object getFieldAt(int columnIndex) {

View File

@@ -34,11 +34,14 @@ public class MessagesControlForm extends DataSetControlForm {
public void MouseAction2() throws Exception {
ShowCurrentObject();
}
/*
@Override
protected void createFilters() {
super.createFilters();
headersTextFilters.put(3, new HeaderTextFilter(dataSource, 3));
}
*/
@Override
public boolean hasMenuBar() {
return false;

View File

@@ -21,4 +21,8 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
public Comparator<M> getComparator() {
return Comparator.comparingInt(o -> o.line);
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel);
}
}

View File

@@ -7,8 +7,10 @@ public class MessageNote extends Message {
}
public MessageNote() {
}
/*
@Override
public boolean isVisible() {
return super.isVisible() && value.contains(filterValue);
}
*/
}

View File

@@ -18,18 +18,4 @@ public class NotesDBTable extends MessagesDBTable<MessageNote> {
public Current CurrentName() {
return Current.Notes;
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel) {
@Override
public void changeHeaderFilterValue(int columnIndex, String text) {
if (columnIndex == 3)
MessageNote.filterValue = text;
}
@Override
public Object getHeaderFilterValue(int columnIndex) {
return MessageNote.filterValue;
}
};
}
}

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;
};
};
}
}