EaZyCode/ByteEdit
1
0 Fork 0
mirror of https://github.com/SuspiciousActivity/ByteEdit.git synced 2026-08-13 17:56:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Indentation in decompilers to 4 spaces, fixed some threading issues

Browse Source
This commit is contained in:
SuspiciousActivity committed 2021-03-12 00:29:09 +01:00
1 parent 71437eac81
commit 71c224f83f
5 files changed
+36 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/me/ByteEdit/boxes/TypeOpenBox.java
+1 -2
View File
@@ -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
+1
View File
@@ -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/decompiler/JDDecompiler.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class JDDecompiler implements Loader, Printer, IDecompiler {
return cw.toByteArray();
}
protected static final String TAB = " ";
protected static final String TAB = " ";
protected static final String NEWLINE = "\n";
protected int indentationCount = 0;
src/me/ByteEdit/edit/TypeOpenBox.java
+1 -2
View File
@@ -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
+32 -21
View File
@@ -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(() -> {
txtByteEditView.setCaretPosition(0);
try {
txtByteEditView.setSyntaxEditingStyle(decompiler.getSyntaxStyle());
} catch (Throwable t) {
synchronized (treeLock) {
txtByteEditView.setCaretPosition(0);
try {
txtByteEditView.setSyntaxEditingStyle(decompiler.getSyntaxStyle());
} catch (Throwable t) {
}
txtByteEditView.setEditable(decompiler.isEditable());
}
txtByteEditView.setEditable(decompiler.isEditable());
});
} catch (Exception e1) {
e1.printStackTrace();
@@ -796,9 +798,14 @@ public class Main extends JFrame {
}
}
}
txtByteEditView.setText(dis);
if (dis.length() > prev)
txtByteEditView.setCaretPosition(prev);
String fdis = dis;
EventQueue.invokeAndWait(() -> {
synchronized (treeLock) {
txtByteEditView.setText(fdis);
if (fdis.length() > prev)
txtByteEditView.setCaretPosition(prev);
}
});
} catch (Exception e2) {
e2.printStackTrace();
}
@@ -857,14 +864,18 @@ public class Main extends JFrame {
public void run() {
synchronized (treeLock) {
save(file, classNodes.values());
EventQueue.invokeLater(new Runnable() {
public void run() {
synchronized (treeLock) {
isChangingFile = false;
Main.this.setTitle("ByteEdit");
try {
EventQueue.invokeAndWait(new Runnable() {
public void run() {
synchronized (treeLock) {
isChangingFile = false;
Main.this.setTitle("ByteEdit");
}
}
}
});
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}).start();