From a9cb3cf5a6a1c48cfbb45d2f33e98062563ed867 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 1 Nov 2022 10:47:16 +0100
Subject: [PATCH] Remove dependencies to Argeo Commons IO

---
 org.argeo.util/src/org/argeo/util/StreamUtils.java        | 8 ++++++++
 .../eclipse/ui/rcp/internal/rwt/RcpResourceManager.java   | 7 +++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/org.argeo.util/src/org/argeo/util/StreamUtils.java b/org.argeo.util/src/org/argeo/util/StreamUtils.java
index 30404f1e4..5e4e636fc 100644
--- a/org.argeo.util/src/org/argeo/util/StreamUtils.java
+++ b/org.argeo.util/src/org/argeo/util/StreamUtils.java
@@ -1,6 +1,7 @@
 package org.argeo.util;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -44,6 +45,13 @@ public class StreamUtils {
 		return count;
 	}
 
+	public static byte[] toByteArray(InputStream in) throws IOException {
+		try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+			copy(in, out);
+			return out.toByteArray();
+		}
+	}
+
 	public static void closeQuietly(InputStream in) {
 		if (in != null)
 			try {
diff --git a/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java
index 91109a9de..ac4217184 100644
--- a/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java
+++ b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java
@@ -7,17 +7,16 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.commons.io.IOUtils;
+import org.argeo.util.StreamUtils;
 import org.eclipse.rap.rwt.service.ResourceManager;
 
 public class RcpResourceManager implements ResourceManager {
-	private Map<String, byte[]> register = Collections
-			.synchronizedMap(new TreeMap<String, byte[]>());
+	private Map<String, byte[]> register = Collections.synchronizedMap(new TreeMap<String, byte[]>());
 
 	@Override
 	public void register(String name, InputStream in) {
 		try {
-			register.put(name, IOUtils.toByteArray(in));
+			register.put(name, StreamUtils.toByteArray(in));
 		} catch (IOException e) {
 			throw new RuntimeException("Cannot register " + name, e);
 		}
-- 
2.30.2