projects
/
gpl
/
argeo-suite.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c8592ef
)
Make logging less verbose
author
Mathieu Baudier <mbaudier@argeo.org>
Wed, 20 Dec 2023 07:46:09 +0000
(08:46 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Wed, 20 Dec 2023 07:46:09 +0000
(08:46 +0100)
org.argeo.app.core/src/org/argeo/app/ux/js/JsClient.java
patch
|
blob
|
history
org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java
patch
|
blob
|
history
swt/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java
patch
|
blob
|
history
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 2503cf05e482a06eb0bfb14a8feaf0ce21986cbf..708daff143af5191d6fc76c5b5e36158a2ebcd52 100644
(file)
--- 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) {
}
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 546a129a23b4eb4e05aa72bb6c258224fa2ca0fc..5310542cd46c9aa5620e33fb5bfb2aceb329044c 100644
(file)
--- 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("")) {
}
String str = sb.toString();
if (!str.equals("")) {
- if (log.is
Debug
Enabled())
- log.
debug
(str);
+ if (log.is
Trace
Enabled())
+ log.
trace
(str);
writer.append(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 c936db3889a2486343583078223161697a2ab50c..57a694907c44d0790d027062c483a5586e02070e 100644
(file)
--- 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) {
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);
continue terms;
}
res.add(term);