#1657: Refine types for reading resources for generic / Java platforms

davidpcaldwell · Sep 11, 2024 · 4269874 · 4269874
1 parent aba1887
commit 4269874
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/jrunscript/io/grid.fifty.ts b/jrunscript/io/grid.fifty.ts
@@ -25,7 +25,7 @@ namespace slime.jrunscript.io.internal.grid {
 }
 
 namespace slime.jrunscript.io.grid.excel {
-	export type Format = (p: { resource: slime.Resource }) => slime.jrunscript.native.org.apache.poi.POIDocument
+	export type Format = (p: { resource: slime.jrunscript.runtime.old.Resource }) => slime.jrunscript.native.org.apache.poi.POIDocument
 
 	interface Cell {
 		getValue(): string | number
@@ -55,7 +55,7 @@ namespace slime.jrunscript.io.grid.excel {
 			xlsx: Format
 		}
 		Workbook: {
-			(p: { resource: slime.Resource, format?: Format }): Workbook
+			(p: { resource: slime.jrunscript.runtime.old.Resource, format?: Format }): Workbook
 		}
 		toJavascriptDate: (num: number) => Date
 	}

diff --git a/loader/expression.fifty.ts b/loader/expression.fifty.ts
@@ -187,12 +187,6 @@ namespace slime {
 			 */
 			(p: slime.external.e4x.XMLConstructor): slime.external.e4x.XML
 
-			//	TODO	Java-specific
-			(p: slime.jrunscript.PropertiesJavaClass): slime.jrunscript.native.java.util.Properties
-
-			//	TODO	Java-specific
-			(p: slime.jrunscript.runtime.io.Exports["Streams"]["binary"]): slime.jrunscript.runtime.io.InputStream
-
 			/**
 			 * Returns the content of this resource as a string.
 			 */

diff --git a/loader/jrunscript/expression.fifty.ts b/loader/jrunscript/expression.fifty.ts
@@ -79,6 +79,12 @@ namespace slime.jrunscript.runtime {
 			 * implementation from the SLIME runtime Resource.
 			 */
 			read: slime.Resource["read"] & {
+				//	TODO	Java-specific
+				(p: slime.jrunscript.PropertiesJavaClass): slime.jrunscript.native.java.util.Properties
+
+				//	TODO	Java-specific
+				(p: slime.jrunscript.runtime.io.Exports["Streams"]["binary"]): slime.jrunscript.runtime.io.InputStream
+
 				/**
 				 * (if content can be read as a byte stream) Reads the content of this resource as a byte stream.
 				 * @returns A stream that can provide the content of this resource.
@@ -188,7 +194,7 @@ namespace slime.jrunscript.runtime {
 						read: {
 							string: function() { return lines.join("\n"); }
 						}
-					});
+					}) as slime.jrunscript.runtime.old.Resource;
 					var _properties = resource.read(Packages.java.util.Properties);
 					var properties = {
 						getProperty: function(name) {