From dbd2a20e2ea265bcefd5ed4fe92b2ebd2e71e3d9 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 20 Dec 2023 08:46:09 +0100 Subject: [PATCH] Make logging less verbose --- org.argeo.app.core/src/org/argeo/app/ux/js/JsClient.java | 7 ++++++- .../src/org/argeo/app/servlet/odk/OdkFormListServlet.java | 4 ++-- .../src/org/argeo/app/ui/forms/MultiTermsPart.java | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/org.argeo.app.core/src/org/argeo/app/ux/js/JsClient.java b/org.argeo.app.core/src/org/argeo/app/ux/js/JsClient.java index 2503cf0..708daff 100644 --- a/org.argeo.app.core/src/org/argeo/app/ux/js/JsClient.java +++ b/org.argeo.app.core/src/org/argeo/app/ux/js/JsClient.java @@ -65,7 +65,12 @@ public interface JsClient { } default boolean isInstanceOf(String reference, String jsClass) { - return (Boolean) evaluate("return "+getJsVarName(reference) + " instanceof " + jsClass); + try { + return (Boolean) evaluate("return " + getJsVarName(reference) + " instanceof " + jsClass); + } catch (Exception e) { + // TODO better understand why instanceof is often failing with SWT Browser + return false; + } } /* diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java index 546a129..5310542 100644 --- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java +++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java @@ -93,8 +93,8 @@ public class OdkFormListServlet extends HttpServlet { } String str = sb.toString(); if (!str.equals("")) { - if (log.isDebugEnabled()) - log.debug(str); + if (log.isTraceEnabled()) + log.trace(str); writer.append(str); } } diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java index c936db3..57a6949 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java @@ -185,7 +185,8 @@ public class MultiTermsPart extends AbstractTermsPart { terms: for (String str : curr) { Term term = termsManager.getTerm(str); if (term == null) { - log.warn("Ignoring term " + str + " for " + getNode() + ", as it was not found."); + if (log.isTraceEnabled()) + log.warn("Ignoring term " + str + " for " + getNode() + ", as it was not found."); continue terms; } res.add(term); -- 2.30.2