Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Class files are now added to the list file contents

Browse source
This commit is contained in:
Szperak 2015-08-31 16:35:39 +02:00
parent 91f42e91d0
commit a0d552e573
2 changed files with 19 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/the/bytecode/club/bytecodeviewer/JarUtils.java
View file

@ -63,26 +63,28 @@ public class JarUtils {
try { try {
final String name = entry.getName(); final String name = entry.getName();
final byte[] bytes = getBytes(jis); final byte[] bytes = getBytes(jis);
if (!name.endsWith(".class")) { if(!files.containsKey(name)){
if(!entry.isDirectory()) if (!name.endsWith(".class")) {
files.put(name, bytes); if(!entry.isDirectory())
} else { files.put(name, bytes);
String cafebabe = String.format("%02X", bytes[0])
+ String.format("%02X", bytes[1])
+ String.format("%02X", bytes[2])
+ String.format("%02X", bytes[3]);
if(cafebabe.toLowerCase().equals("cafebabe")) {
try {
final ClassNode cn = getNode(bytes);
container.classes.add(cn);
} catch(Exception e) {
e.printStackTrace();
}
} else { } else {
System.out.println(jarFile+">"+name+": Header does not start with CAFEBABE, ignoring."); String cafebabe = String.format("%02X", bytes[0])
+ String.format("%02X", bytes[1])
+ String.format("%02X", bytes[2])
+ String.format("%02X", bytes[3]);
if(cafebabe.toLowerCase().equals("cafebabe")) {
try {
final ClassNode cn = getNode(bytes);
container.classes.add(cn);
} catch(Exception e) {
e.printStackTrace();
}
} else {
System.out.println(jarFile+">"+name+": Header does not start with CAFEBABE, ignoring.");
}
files.put(name, bytes);
} }
} }
} catch(Exception e) { } catch(Exception e) {
new the.bytecode.club.bytecodeviewer.api.ExceptionUI(e); new the.bytecode.club.bytecodeviewer.api.ExceptionUI(e);
} finally { } finally {

30
src/the/bytecode/club/bytecodeviewer/gui/FileNavigationPane.java
View file

@ -311,36 +311,6 @@ public class FileNavigationPane extends VisibleComponent implements
ImageRenderer renderer = new ImageRenderer(); ImageRenderer renderer = new ImageRenderer();
tree.setCellRenderer(renderer); tree.setCellRenderer(renderer);
if(!container.classes.isEmpty()) {
for(ClassNode c : container.classes) {
String name = c.name;
final String[] spl = name.split("/");
if (spl.length < 2) {
root.add(new MyTreeNode(name+".class"));
} else {
MyTreeNode parent = root;
for (int i1 = 0; i1 < spl.length; i1++) {
String s = spl[i1];
MyTreeNode child = null;
for (int i = 0; i < parent.getChildCount(); i++) {
if (((MyTreeNode) parent.getChildAt(i)).getUserObject()
.equals(s)) {
child = (MyTreeNode) parent.getChildAt(i);
break;
}
}
if (child == null) {
if(i1 == spl.length-1)
child = new MyTreeNode(s+".class");
else
child = new MyTreeNode(s);
parent.add(child);
}
parent = child;
}
}
}
}
if(!container.files.isEmpty()) { if(!container.files.isEmpty()) {
for (final Entry<String, byte[]> entry : container.files.entrySet()) { for (final Entry<String, byte[]> entry : container.files.entrySet()) {