Generalize workspace exporting a bit more

Col-E · Aug 12, 2023 · 67643ee · 67643ee
1 parent da896c6
commit 67643ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/recaf-api/src/main/java/software/coley/recaf/workspace/io/WorkspaceExportOptions.java b/recaf-api/src/main/java/software/coley/recaf/workspace/io/WorkspaceExportOptions.java
@@ -203,11 +203,13 @@ private void populate(Workspace workspace) {
 		 */
 		private void mapInto(Map<String, byte[]> map, WorkspaceResource resource) {
 			// Place classes into map
-			for (JvmClassInfo classInfo : resource.getJvmClassBundle()) {
-				String key = classInfo.getName() + ".class";
-				map.put(key, classInfo.getBytecode());
-				updateProperties(key, classInfo);
-			}
+			resource.jvmClassBundleStream().forEach(bundle -> {
+				for (JvmClassInfo classInfo : bundle) {
+					String key = classInfo.getName() + ".class";
+					map.put(key, classInfo.getBytecode());
+					updateProperties(key, classInfo);
+				}
+			});
 
 			// Place versioned files into map
 			for (Map.Entry<Integer, JvmClassBundle> entry : resource.getVersionedJvmClassBundles().entrySet()) {

diff --git a/.../main/java/software/coley/recaf/workspace/model/resource/AgentServerRemoteVmResource.java b/.../main/java/software/coley/recaf/workspace/model/resource/AgentServerRemoteVmResource.java
@@ -84,9 +84,8 @@ public Map<Integer, JvmClassBundle> getJvmClassloaderBundles() {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public Stream<JvmClassBundle> jvmClassBundleStream() {
-		return (Stream<JvmClassBundle>) (Object) remoteBundleMap.values().stream();
+		return Stream.concat(super.jvmClassBundleStream(), remoteBundleMap.values().stream());
 	}
 
 	@Override