LogFilterModel#processLine can return null

This commit is contained in:
unknown
2009-10-10 17:17:26 +04:00
committed by Eugene Kudelevsky
parent 8f7ee3f71b
commit e38d642d84
2 changed files with 11 additions and 2 deletions
@@ -77,5 +77,6 @@ public abstract class LogFilterModel {
public abstract void selectFilter(LogFilter filter);
@Nullable
public abstract Key processLine(String line);
}
@@ -288,7 +288,10 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L
}
else {
if (myModel.isApplicable(text)) {
myProcessHandler.notifyTextAvailable(text + "\n", myModel.processLine(text));
Key key = myModel.processLine(text);
if (key != null) {
myProcessHandler.notifyTextAvailable(text + "\n", key);
}
}
myOriginalDocument = getOriginalDocument();
if (myOriginalDocument != null) {
@@ -372,7 +375,12 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L
}
else if (isApplicable.value(line)) {
Key key = myModel.processLine(line);
myConsole.print(line + "\n", ConsoleViewContentType.getConsoleViewType(key));
if (key != null) {
ConsoleViewContentType type = ConsoleViewContentType.getConsoleViewType(key);
if (type != null) {
myConsole.print(line + "\n", type);
}
}
}
return true;
}