Skip to content
Snippets Groups Projects
Unverified Commit 9886bd32 authored by Luca Keidel's avatar Luca Keidel
Browse files

Improved logging model performance

parent 1fa683f5
Branches
No related tags found
1 merge request!5Configuration system
...@@ -14,8 +14,7 @@ public class FilteredLogModel extends AbstractListModel<LogMessage> { ...@@ -14,8 +14,7 @@ public class FilteredLogModel extends AbstractListModel<LogMessage> {
public FilteredLogModel() { public FilteredLogModel() {
super(); super();
this. this.log = new ArrayList<>();
log = new ArrayList<>();
filteredLog = new ArrayList<>(); filteredLog = new ArrayList<>();
} }
...@@ -32,9 +31,7 @@ public class FilteredLogModel extends AbstractListModel<LogMessage> { ...@@ -32,9 +31,7 @@ public class FilteredLogModel extends AbstractListModel<LogMessage> {
private void refilter() { private void refilter() {
filteredLog.clear(); filteredLog.clear();
for (LogMessage msg : log) { for (LogMessage msg : log) {
if (!filterTransactions if (matchesFilter(msg)) {
|| (msg.getContext() == LogMessage.Context.TRANSACTION_SUCCESS
|| msg.getContext() == LogMessage.Context.TRANSACTION_FAIL)) {
filteredLog.add(msg); filteredLog.add(msg);
} }
...@@ -42,6 +39,12 @@ public class FilteredLogModel extends AbstractListModel<LogMessage> { ...@@ -42,6 +39,12 @@ public class FilteredLogModel extends AbstractListModel<LogMessage> {
fireContentsChanged(this, 0, getSize()-1); fireContentsChanged(this, 0, getSize()-1);
} }
private boolean matchesFilter(LogMessage msg){
return !filterTransactions
|| (msg.getContext() == LogMessage.Context.TRANSACTION_SUCCESS
|| msg.getContext() == LogMessage.Context.TRANSACTION_FAIL);
}
@Override @Override
public int getSize() { public int getSize() {
return filteredLog.size(); return filteredLog.size();
...@@ -54,7 +57,13 @@ public class FilteredLogModel extends AbstractListModel<LogMessage> { ...@@ -54,7 +57,13 @@ public class FilteredLogModel extends AbstractListModel<LogMessage> {
public void addElement(LogMessage message) { public void addElement(LogMessage message) {
log.add(message); log.add(message);
refilter();
if(matchesFilter(message)){
filteredLog.add(message);
int index = getSize() - 1;
fireIntervalAdded(this, index, index);
}
} }
} }
...@@ -7,8 +7,6 @@ import java.awt.*; ...@@ -7,8 +7,6 @@ import java.awt.*;
import java.awt.event.ItemEvent; import java.awt.event.ItemEvent;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
public class SuperVisorGuiControlImpl implements SuperVisorGuiControl { public class SuperVisorGuiControlImpl implements SuperVisorGuiControl {
private SuperVisorImpl superVisor; private SuperVisorImpl superVisor;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment