LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-16 01:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1015, #1466, #1513 Better error messages during saving, display message on out of memory

Browse Source
This commit is contained in:
Jindra Petřík
2021-03-25 20:53:09 +01:00
parent f3176dc204
commit 941d0e0318
7 changed files with 66 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/jpexs/decompiler/flash/gui/Main.java
View File

@@ -1072,6 +1072,12 @@ public class Main {
bos.write((swfSize >> 24) & 0xff);
}
}
} catch (Throwable t) {
stopSaving(savedFile);
if (tmpFile.exists()) {
tmpFile.delete();
}
throw t;
}
if (tmpFile.exists()) {
if (tmpFile.length() > 0) {
@@ -1534,13 +1540,36 @@ public class Main {
Main.saveFile(swf, fileName, mode, exeExportMode);
Configuration.lastSaveDir.set(file.getParentFile().getAbsolutePath());
return true;
} catch (IOException ex) {
View.showMessageDialog(null, AppStrings.translate("error.file.write"));
} catch (Exception | OutOfMemoryError | StackOverflowError ex) {
handleSaveError(ex);
}
}
return false;
}
public static void handleSaveError(Throwable ex) {
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, "Error saving file", ex);
if (ex instanceof OutOfMemoryError) {
String errorMessage = AppStrings.translate("error.file.save") + ".";
errorMessage += " ";
long heapMaxSize = Runtime.getRuntime().maxMemory();
long heapMaxSizeMb = heapMaxSize / 1024 / 1024;
String currentMaxHeap = "" + heapMaxSizeMb + "m";
errorMessage += AppStrings.translate("error.outOfMemory").replace("%maxheap%", currentMaxHeap);
errorMessage += "\n";
if (Platform.isWindows()) {
errorMessage += AppStrings.translate("error.outOfMemory.windows");
} else {
errorMessage += AppStrings.translate("error.outOfMemory.unixmac");
}
errorMessage += "\n";
errorMessage += AppStrings.translate("error.outOfMemory.64bit");
View.showMessageDialog(null, errorMessage, AppStrings.translate("error.outOfMemory.title"), JOptionPane.ERROR_MESSAGE);
} else {
View.showMessageDialog(null, AppStrings.translate("error.file.save") + ": " + ex.getLocalizedMessage(), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
}
}
public static boolean openFileDialog() {
View.checkAccess();