Better Tree Layout.

deathmarine · Jul 18, 2013 · cd2a1ad · cd2a1ad
1 parent 3b586f9
commit cd2a1ad
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/src/com/modcrafting/luyten/Model.java b/src/com/modcrafting/luyten/Model.java
@@ -693,17 +693,31 @@ public void loadFile(File file) throws IOException {
                 JarFile jfile = new JarFile(file);
                 Enumeration<JarEntry> entry = jfile.entries();
                 DefaultMutableTreeNode top = new DefaultMutableTreeNode(getName(file.getName()));
+                List<String> packs = new ArrayList<String>();
                 List<String> mass = new ArrayList<String>();
-                while (entry.hasMoreElements())
-                    mass.add(entry.nextElement().getName());
-                Collections.sort(mass, String.CASE_INSENSITIVE_ORDER);
+                while (entry.hasMoreElements()){
+                	JarEntry e = entry.nextElement();
+                	if(e.isDirectory()){
+                		packs.add(e.getName());
+                	}else{
+                        mass.add(e.getName());
+                	}
+                }
                 List<String> sort = new ArrayList<String>();
+                Collections.sort(mass, String.CASE_INSENSITIVE_ORDER);
                 for(String m : mass)
                 	if(m.contains("META-INF") && !sort.contains(m))
                 		sort.add(m);
-                for(String m : mass)
-                	if(!m.contains("META-INF") && m.contains("/") && !sort.contains(m))
-                		sort.add(m);
+                Collections.sort(packs, String.CASE_INSENSITIVE_ORDER);                
+                Collections.sort(packs, new Comparator<String>(){
+                	public int compare(String o1, String o2) {
+                			return o2.split("/").length - o1.split("/").length;
+                	}
+                });
+                for(String pack : packs)
+                	for(String m : mass)
+                		if(!m.contains("META-INF") && m.contains(pack) && !m.replace(pack, "").contains("/"))
+                			sort.add(m);
                 for(String m : mass)
                 	if(!m.contains("META-INF") && !m.contains("/") && !sort.contains(m))
                 		sort.add(m);