Indentation in decompilers to 4 spaces, fixed some threading issues

src/me/ByteEdit/boxes/TypeOpenBox.java

@@ -40,11 +40,10 @@ public class TypeOpenBox extends JFrame {
 		DefaultListModel<String> model = new DefaultListModel<>();
 		JList<String> list = new JList(model);
 		list.addListSelectionListener(new ListSelectionListener() {
-
+			@Override
 			public void valueChanged(ListSelectionEvent e) {
 				String val = list.getSelectedValue();
 				if (val != null && !val.equals(Main.currentNodeName)) {
-
 					SingleThreadedExecutor.execute(() -> Main.selectFile(val));
 				}
 			}

src/me/ByteEdit/decompiler/FernflowerDecompiler.java

@@ -63,6 +63,7 @@ public class FernflowerDecompiler implements IBytecodeProvider, IResultSaver, ID
 			for (Entry<String, Boolean> entry : options.entrySet()) {
 				map.put(entry.getKey(), entry.getValue() ? "1" : "0");
 			}
+			map.put("ind", "    ");
 			Fernflower f = new Fernflower(this, this, map, new IFernflowerLogger() {
 				@Override
 				public void writeMessage(String message, Throwable t) {

src/me/ByteEdit/edit/TypeOpenBox.java

@@ -48,11 +48,10 @@ public class TypeOpenBox extends JFrame {
 		DefaultListModel<String> model = new DefaultListModel<>();
 		JList<String> list = new JList(model);
 		list.addListSelectionListener(new ListSelectionListener() {
-
+			@Override
 			public void valueChanged(ListSelectionEvent e) {
 				String val = list.getSelectedValue();
 				if (val != null && !val.equals(Main.currentNodeName)) {
-
 					SingleThreadedExecutor.execute(() -> Main.selectFile(val));
 				}
 			}

src/me/ByteEdit/main/Main.java

@@ -303,7 +303,7 @@ public class Main extends JFrame {
 									try {
 										ArchiveTreeModel model = new ArchiveTreeModel(new ZipFile(jarFile), classNodes,
 												otherFiles);
-										EventQueue.invokeLater(new Runnable() {
+										EventQueue.invokeAndWait(new Runnable() {
 											public void run() {
 												synchronized (treeLock) {
 													tree.setModel(model);
@@ -320,7 +320,7 @@ public class Main extends JFrame {
 												}
 											}
 										});
-									} catch (IOException e) {
+									} catch (Exception e) {
 										e.printStackTrace();
 									}
 								}
@@ -458,7 +458,7 @@ public class Main extends JFrame {
 									try {
 										ArchiveTreeModel model = new ArchiveTreeModel(new ZipFile(jarFile), classNodes,
 												otherFiles);
-										EventQueue.invokeLater(new Runnable() {
+										EventQueue.invokeAndWait(new Runnable() {
 											public void run() {
 												synchronized (treeLock) {
 													tree.setModel(model);
@@ -467,7 +467,7 @@ public class Main extends JFrame {
 												}
 											}
 										});
-									} catch (IOException e) {
+									} catch (Exception e) {
 										e.printStackTrace();
 									}
 								}
@@ -545,7 +545,7 @@ public class Main extends JFrame {
 											try {
 												ArchiveTreeModel model = new ArchiveTreeModel(new ZipFile(jarFile),
 														classNodes, otherFiles);
-												EventQueue.invokeLater(new Runnable() {
+												EventQueue.invokeAndWait(new Runnable() {
 													public void run() {
 														synchronized (treeLock) {
 															tree.setModel(model);
@@ -562,7 +562,7 @@ public class Main extends JFrame {
 														}
 													}
 												});
-											} catch (IOException e) {
+											} catch (Exception e) {
 												e.printStackTrace();
 											}
 										}
@@ -667,12 +667,14 @@ public class Main extends JFrame {
 							decompileCurrentNode();
 							try {
 								EventQueue.invokeAndWait(() -> {
+									synchronized (treeLock) {
 										txtByteEditView.setCaretPosition(0);
 										try {
 											txtByteEditView.setSyntaxEditingStyle(decompiler.getSyntaxStyle());
 										} catch (Throwable t) {
 										}
 										txtByteEditView.setEditable(decompiler.isEditable());
+									}
 								});
 							} catch (Exception e1) {
 								e1.printStackTrace();
@@ -796,9 +798,14 @@ public class Main extends JFrame {
 					}
 				}
 			}
-			txtByteEditView.setText(dis);
+			String fdis = dis;
-			if (dis.length() > prev)
+			EventQueue.invokeAndWait(() -> {
+				synchronized (treeLock) {
+					txtByteEditView.setText(fdis);
+					if (fdis.length() > prev)
 						txtByteEditView.setCaretPosition(prev);
+				}
+			});
 		} catch (Exception e2) {
 			e2.printStackTrace();
 		}
@@ -857,7 +864,8 @@ public class Main extends JFrame {
 							public void run() {
 								synchronized (treeLock) {
 									save(file, classNodes.values());
-									EventQueue.invokeLater(new Runnable() {
+									try {
+										EventQueue.invokeAndWait(new Runnable() {
 											public void run() {
 												synchronized (treeLock) {
 													isChangingFile = false;
@@ -865,6 +873,9 @@ public class Main extends JFrame {
 												}
 											}
 										});
+									} catch (Exception e) {
+										e.printStackTrace();
+									}
 								}
 							}
 						}).start();