From b983d0022a1bb2c84e9aa6d8fcb8a0423ba5b256 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 24 May 2023 06:17:20 +0200
Subject: [PATCH] Adapt to changes in Commons IO

---
 .../src/org/argeo/app/swt/docbook/DbkTextInterpreter.java | 8 ++------
 .../src/org/argeo/app/ui/docbook/DbkTextInterpreter.java  | 5 +----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/docbook/DbkTextInterpreter.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/docbook/DbkTextInterpreter.java
index 1eff7a4..27a666c 100644
--- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/docbook/DbkTextInterpreter.java
+++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/docbook/DbkTextInterpreter.java
@@ -18,18 +18,16 @@ import javax.xml.transform.stream.StreamResult;
 
 import org.apache.commons.io.IOUtils;
 import org.argeo.api.acr.Content;
-import org.argeo.app.docbook.DbkType;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
 
 /** Based on HTML with a few Wiki-like shortcuts. */
 public class DbkTextInterpreter implements TextInterpreter {
 
 	private TransformerFactory transformerFactory = TransformerFactory.newDefaultInstance();
 
-	private String linkCssClass = DbkType.link.name();
+//	private String linkCssClass = DbkType.link.name();
 
 	@Override
 	public void write(Content node, String content) {
@@ -184,7 +182,7 @@ public class DbkTextInterpreter implements TextInterpreter {
 //				Text text = (Text) n;
 //				sb.append(text.getTextContent());
 //			} else 
-				if (n instanceof Element) {
+			if (n instanceof Element) {
 				Element elem = (Element) n;
 				sb.append(elem.getTextContent());
 			}
@@ -246,8 +244,6 @@ public class DbkTextInterpreter implements TextInterpreter {
 				sb.append(lines.get(i));
 			}
 			return sb.toString();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
 		}
 	}
 
diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkTextInterpreter.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkTextInterpreter.java
index ff12348..80f768c 100644
--- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkTextInterpreter.java
+++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkTextInterpreter.java
@@ -18,7 +18,6 @@ import javax.jcr.NodeIterator;
 import javax.jcr.Property;
 import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
-import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.commons.io.IOUtils;
 import org.argeo.app.docbook.DbkAttr;
@@ -28,7 +27,7 @@ import org.argeo.jcr.JcrException;
 
 /** Based on HTML with a few Wiki-like shortcuts. */
 public class DbkTextInterpreter implements TextInterpreter {
-	private DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+//	private DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
 
 	private String linkCssClass = DbkType.link.name();
 
@@ -242,8 +241,6 @@ public class DbkTextInterpreter implements TextInterpreter {
 				sb.append(lines.get(i));
 			}
 			return sb.toString();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
 		}
 	}
 
-- 
2.30.2