Filtering in ComsoleApp

luwrain · May 6, 2024 · d10f038 · d10f038
1 parent 923b3e9
commit d10f038
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/org/luwrain/app/console/App.java b/src/main/java/org/luwrain/app/console/App.java
@@ -28,6 +28,7 @@
 public final class App extends AppBase<Strings> implements MonoApp
 {
  static final ArrayList<Entry> events = new ArrayList<>();
+ final List<Entry> entries = new ArrayList<>();
  private ConsoleCommand[] commands = new ConsoleCommand[0];
  private MainLayout mainLayout = null;
 
@@ -38,6 +39,9 @@ public App()
 
  @Override protected AreaLayout onAppInit()
  {
+ entries.addAll(events.parallelStream().filter(e->{
+ return e.logger.startsWith("org.luwrain");
+ }).toList());
  this.mainLayout = new MainLayout(this);
  this.commands = new ConsoleCommand[]{
  new Commands.Prop(getLuwrain()),

diff --git a/src/main/java/org/luwrain/app/console/Entry.java b/src/main/java/org/luwrain/app/console/Entry.java
@@ -22,10 +22,12 @@
 
 final class Entry
 {
+ final String logger;
  final String message;
  final Throwable ex;
  Entry(LogEvent event)
  {
+ this.logger = event.getLoggerName();
  this.message = event.getMessage().getFormattedMessage();
  this.ex = event.getMessage().getThrowable();
  }

diff --git a/src/main/java/org/luwrain/app/console/MainLayout.java b/src/main/java/org/luwrain/app/console/MainLayout.java
@@ -41,7 +41,7 @@ final class MainLayout extends LayoutBase implements ConsoleArea.InputHandler
  this.app = app;
  this.consoleArea = new ConsoleArea<Entry>(consoleParams(params -> {
  params.name = "LUWRAIN";
- params.model = new ListModel<Entry>(App.events);
+ params.model = new ListModel<Entry>(app.entries);
  params.appearance = new Appearance();
  params.inputHandler = this;
  params.inputPos = ConsoleArea.InputPos.BOTTOM;

diff --git a/src/main/java/org/luwrain/script/Hooks.java b/src/main/java/org/luwrain/script/Hooks.java
@@ -72,7 +72,7 @@ static public boolean chainOfResponsibilityNoExc(HookContainer container, String
  }
  catch(Throwable ex)
  {
- log.error("The " + hookName + " thrown an exception", ex);
+ log.error("The " + hookName + " hook thrown an exception", ex);
  return false;
  }
  }

diff --git a/src/main/java/org/luwrain/script/core/PropertiesObj.java b/src/main/java/org/luwrain/script/core/PropertiesObj.java
@@ -31,7 +31,7 @@ public class PropertiesObj
 {
  protected Properties properties;
 
- public PropertiesObj(Properties props)
+ public PropertiesObj(Properties properties)
  {
  notNull(properties, "properties");
  this.properties = properties;
@@ -52,7 +52,7 @@ private Object setPropertyImpl(Value[] args)
  {
  if (args == null || args.length != 2)
  throw new IllegalArgumentException("setProperty() takes two argument");
- if (args[0] == null || args[0].isNull() || ! args[0].asString().trim().isEmpty())
+ if (args[0] == null || args[0].isNull() || args[0].asString().trim().isEmpty())
  throw new IllegalArgumentException("setProperty() takes a non-empty string as the first argument");
  if (args[1] != null && !args[1].isNull() && !args[1].isString())
  throw new IllegalArgumentException("setProperty() takes null or a string as the second argument");