Use the flash-supplied error messages for file loading errors

dionjwa · Jun 19, 2012 · 68593c0 · 68593c0
1 parent 0afcf77
commit 68593c0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/exporter/src/main/as/flump/export/FlaLoader.as b/exporter/src/main/as/flump/export/FlaLoader.as
@@ -55,8 +55,8 @@ public class FlaLoader
             }
             _loader.shutdown();
         });
-        loadZip.failed.add(function (error :Object) :void {
-            _library.addTopLevelError(ParseError.CRIT, "Unable to read " + file.nativePath, error);
+        loadZip.failed.add(function (error :Error) :void {
+            _library.addTopLevelError(ParseError.CRIT, error.message, error);
             _loader.shutdown();
         });
     }

diff --git a/exporter/src/main/as/flump/export/XflLoader.as b/exporter/src/main/as/flump/export/XflLoader.as
@@ -48,9 +48,8 @@ public class XflLoader
             }
             _loader.shutdown();
         });
-        loadDomFile.failed.add(function (error :Object) :void {
-            _library.addTopLevelError(ParseError.CRIT, "Unable to read " + domFile.nativePath,
-                error);
+        loadDomFile.failed.add(function (error :Error) :void {
+            _library.addTopLevelError(ParseError.CRIT, error.message, error);
             _loader.shutdown();
         });
     }
@@ -60,8 +59,8 @@ public class XflLoader
         loadLibraryFile.succeeded.add(function (data :ByteArray) :void {
             _library.parseLibraryFile(data, file.nativePath);
         });
-        loadLibraryFile.failed.add(function (error :Object) :void {
-            _library.addTopLevelError(ParseError.CRIT, "Unable to read " + file.nativePath, error);
+        loadLibraryFile.failed.add(function (error :Error) :void {
+            _library.addTopLevelError(ParseError.CRIT, error.message, error);
         });
     }
 

diff --git a/exporter/src/main/as/flump/xfl/XflLibrary.as b/exporter/src/main/as/flump/xfl/XflLibrary.as
@@ -145,13 +145,13 @@ public class XflLibrary
             loadSwf.succeeded.add(function (loadedSwf :LoadedSwf) :void {
                 swf = loadedSwf;
             });
-            loadSwf.failed.add(function (error :Object) :void {
-                addTopLevelError(ParseError.CRIT, "Unable to load " + path, error);
+            loadSwf.failed.add(function (error :Error) :void {
+                addTopLevelError(ParseError.CRIT, error.message, error);
             });
             loadSwf.completed.add(onComplete.succeed);
         });
-        loadSwfFile.failed.add(function (error :Object) :void {
-            addTopLevelError(ParseError.CRIT, "Unable to read " + swfFile.nativePath, error);
+        loadSwfFile.failed.add(function (error :Error) :void {
+            addTopLevelError(ParseError.CRIT, error.message, error);
             onComplete.fail(error);
         });