LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 13:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source
This commit is contained in:
Jindra Petřík
2016-02-28 10:17:31 +01:00
parent 9e0251129a 859e394c55
commit 1a74bd5ef9
12 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/Main.java
+5
View File
@@ -1006,6 +1006,8 @@ public class Main {
} else {
throw new IOException("Output is empty");
}
} else {
throw new IOException("Output not found");
}
}
@@ -2250,6 +2252,9 @@ public class Main {
@Override
public void uncaughtException(Thread t, Throwable e) {
logger.log(Level.SEVERE, "Uncaught exception in thread: " + t.getName(), e);
if (e instanceof OutOfMemoryError || !Helper.is64BitJre() && Helper.is64BitOs()) {
View.showMessageDialog(null, AppStrings.translate("message.warning.outOfMemeory32BitJre"), AppStrings.translate("message.warning"), JOptionPane.WARNING_MESSAGE);
}
}
});
src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
+14 -13
View File
@@ -28,7 +28,6 @@ import com.jpexs.decompiler.flash.gui.debugger.DebuggerTools;
import com.jpexs.decompiler.flash.gui.helpers.CheckResources;
import com.jpexs.decompiler.flash.tags.ABCContainerTag;
import com.jpexs.helpers.ByteArrayRange;
import com.jpexs.helpers.Cache;
import com.jpexs.helpers.Helper;
import com.jpexs.helpers.utf8.Utf8Helper;
import com.sun.jna.Platform;
@@ -559,16 +558,16 @@ public abstract class MainFrameMenu implements MenuBuilder {
}
/*protected void cacheOnDiskActionPerformed(ActionEvent evt) {
AbstractButton button = (AbstractButton) evt.getSource();
boolean selected = button.isSelected();
AbstractButton button = (AbstractButton) evt.getSource();
boolean selected = button.isSelected();
Configuration.cacheOnDisk.set(selected);
if (selected) {
Cache.setStorageType(Cache.STORAGE_FILES);
} else {
Cache.setStorageType(Cache.STORAGE_MEMORY);
}
}*/
Configuration.cacheOnDisk.set(selected);
if (selected) {
Cache.setStorageType(Cache.STORAGE_FILES);
} else {
Cache.setStorageType(Cache.STORAGE_MEMORY);
}
}*/
protected void setLanguageActionPerformed(ActionEvent evt) {
new SelectLanguageDialog().display();
}
@@ -949,9 +948,9 @@ public abstract class MainFrameMenu implements MenuBuilder {
});
/*setMenuChecked("/settings/cacheOnDisk", Configuration.cacheOnDisk.get());
Configuration.cacheOnDisk.addListener(configListenerCacheOnDisk = (Boolean newValue) -> {
setMenuChecked("/settings/cacheOnDisk", newValue);
});*/
Configuration.cacheOnDisk.addListener(configListenerCacheOnDisk = (Boolean newValue) -> {
setMenuChecked("/settings/cacheOnDisk", newValue);
});*/
setMenuChecked("/settings/gotoMainClassOnStartup", Configuration.gotoMainClassOnStartup.get());
Configuration.gotoMainClassOnStartup.addListener(configListenerGotoMainClassOnStartup = (Boolean newValue) -> {
setMenuChecked("/settings/gotoMainClassOnStartup", newValue);
@@ -1012,6 +1011,8 @@ public abstract class MainFrameMenu implements MenuBuilder {
String architecture = System.getProperty("sun.arch.data.model");
Runtime runtime = Runtime.getRuntime();
String info = "Architecture: " + architecture + Helper.newLine
+ "Jre 64bit: " + Helper.is64BitJre() + Helper.newLine
+ "Os 64bit: " + Helper.is64BitOs() + Helper.newLine
+ "Max: " + (runtime.maxMemory() / 1024 / 1024) + "MB" + Helper.newLine
+ "Used: " + (runtime.totalMemory() / 1024 / 1024) + "MB" + Helper.newLine
+ "Free: " + (runtime.freeMemory() / 1024 / 1024) + "MB";
src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
+1 -1
View File
@@ -1211,7 +1211,7 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
tag.getTimelined().resetTimeline();
swf.assignClassesToSymbols();
swf.assignExportNamesToSymbols();
mainPanel.repaintTree();
mainPanel.refreshTree(swf);
mainPanel.setTagTreeSelectedNode(tag);
genericEditButton.setVisible(true);
genericSaveButton.setVisible(false);
src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
+1
View File
@@ -712,3 +712,4 @@ menu.settings.simplifyExpressions = Simplify expressions
#after 8.0.1
menu.recentFiles.empty = Recent file list is empty
message.warning.outOfMemeory32BitJre = OutOfMemory error occured. You are running 32bit Java on 64bit system. Please use 64bit Java.