Skip to content

Commit b268e20

Browse files
khiemgluongkhiemgluong
committed
TreeView now has full recursive function
1 parent a6ec7eb commit b268e20

File tree

3 files changed

+18
-115
lines changed

3 files changed

+18
-115
lines changed

‎src/main/java/com/i_comit/windows/DragDrop.java

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public void drop(DropTargetDropEvent event) {
5252
// Loop through the flavors
5353
if (!jTree1.isSelectionEmpty()) {
5454
// jTree1.clearSelection();
55-
System.out.println("TREE VIEW " + TreeView.treeFileFormatter(jTree1.getSelectionPaths()));
5655
List<Path> treepaths = new ArrayList<>();
5756
String path = root + masterFolder + Main.jTree1.getSelectionPaths()[0].toString().substring(1, Main.jTree1.getSelectionPaths()[0].toString().length() - 1).replaceAll(", ", "\\\\");
5857
String fileName = new File(root + masterFolder + Main.jTree1.getSelectionPaths()[0].toString().substring(1, Main.jTree1.getSelectionPaths()[0].toString().length() - 1).replaceAll(", ", "\\\\")).getName();

‎src/main/java/com/i_comit/windows/Main.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
*/
2525
public class Main extends javax.swing.JFrame {
2626

27-
public static String root = "D:\\";
27+
public static String root = "";
2828
public static String masterFolder = "--------\\";
2929
public static String version = "1.6.5";
3030

3131
public Main() {
32-
// root = Paths.get("").toAbsolutePath().toString();
33-
// if (Memory.checkWMIC()) {
32+
root = Paths.get("").toAbsolutePath().toString();
33+
if (Memory.checkWMIC()) {
3434
root = root.substring(0, 3);
3535
initComponents();
3636
FileHider.cleanUp();
@@ -87,7 +87,7 @@ public Main() {
8787
jProgressBar1.setVisible(false);
8888
jProgressBar2.setVisible(false);
8989
dragDrop.setVisible(false);
90-
// }
90+
}
9191
}
9292

9393
private void loginLabelVisibleBool(boolean b) {

‎src/main/java/com/i_comit/windows/TreeView.java

+14-110
Original file line numberDiff line numberDiff line change
@@ -37,70 +37,6 @@ public static DefaultTreeModel populateStoreTree(Path path) {
3737
try {
3838
List<Path> directories = GUI.listDirs(path);
3939
listRoot(directories);
40-
// for (int i = 1; i < directories.size(); i++) {
41-
// DefaultMutableTreeNode dirNodes = new DefaultMutableTreeNode(directories.get(i).toFile().getName()); // level 1 node
42-
//// recursiveDir(directories.get(i).toFile());
43-
// if (recursiveDir(directories.get(i).toFile()).length != 0) {
44-
//// System.out.println("PARENT NODE OF RECURSIVE IS " + directories.get(i).toFile().getName());
45-
// String[] arr = recursiveDir(directories.get(i).toFile());
46-
//// System.out.println("SIZE OF RECURSIVE IS " + arr.length);
47-
// for (int a = 0; a < arr.length; a++) {
48-
// String subDirPath = Main.root + Main.masterFolder + Statics.folderName + File.separator + directories.get(i).toFile().getName() + File.separator + arr[a];
49-
// String subDirPath2 = arr[a];
50-
// DefaultMutableTreeNode subDirNodes = new DefaultMutableTreeNode(subDirPath2); // level 1 node
51-
//
52-
//// System.out.println("SUBDIR NAME IS " + subDirPath2);
53-
// File[] files = new File(subDirPath).listFiles();
54-
//// System.out.println(Arrays.toString(files));
55-
// if (files != null) {
56-
// dirNodes.add(subDirNodes);
57-
// for (int b = 0; b < files.length; b++) {
58-
// if (!files[b].isDirectory()) {
59-
//// System.out.println("FILES " + files[b]);
60-
// DefaultMutableTreeNode fileNodes = new DefaultMutableTreeNode(files[b].getName()); // level 2 (leaf) node
61-
// subDirNodes.add(fileNodes);
62-
// } else {
63-
// DefaultMutableTreeNode subDirNodes1 = new DefaultMutableTreeNode(files[b].getName()); // level 1 node
64-
// subDirNodes.add(subDirNodes1);
65-
// File[] files2 = files[b].listFiles();
66-
// for (int c = 0; c < files2.length; c++) {
67-
// if (!files2[c].isDirectory()) {
68-
//// System.out.println("FILES2 " + files2[c]);
69-
// DefaultMutableTreeNode fileNodes = new DefaultMutableTreeNode(files2[c].getName()); // level 2 (leaf) node
70-
// subDirNodes1.add(fileNodes);
71-
// }
72-
// }
73-
// }
74-
//
75-
// }
76-
// }
77-
// }
78-
// } else {
79-
//
80-
// }
81-
// if (i == 1) {
82-
// treeRoot.add(dirNodes);
83-
// System.out.println("CHILD 1 DIR " + directories.get(i).getFileName());
84-
// File[] files1 = directories.get(i).toFile().listFiles();
85-
// for (int x = 0; x < files1.length; x++) {
86-
// DefaultMutableTreeNode fileNodes = new DefaultMutableTreeNode(files1[x].getName()); // level 2 (leaf) node
87-
// dirNodes.add(fileNodes);
88-
// if (files1[x].isDirectory()) {
89-
//// dirNodes.remove(fileNodes);
90-
// }
91-
// }
92-
// File[] files0 = directories.get(0).toFile().listFiles();
93-
// System.out.println("CHILD 0 DIR " + directories.get(i).getFileName());
94-
// for (int x = 1; x < files0.length; x++) {
95-
// DefaultMutableTreeNode fileNodes = new DefaultMutableTreeNode(files0[x].getName()); // level 2 (leaf) node
96-
// treeRoot.add(fileNodes);
97-
// if (files0[x].isDirectory()) {
98-
//// dirNodes.remove(fileNodes);
99-
// }
100-
// }
101-
// jTree1.expandRow(i);
102-
// }
103-
// }
10440
} catch (IOException ex) {
10541
ex.printStackTrace();
10642
}
@@ -123,7 +59,6 @@ public static void listRoot(List<Path> directories) {
12359
DefaultMutableTreeNode dirNodes = new DefaultMutableTreeNode(filesArr[x].getName()); // level 2 (leaf) node
12460
// treeRoot.add(fileNodes);
12561
if (filesArr[x].isDirectory()) {
126-
// dirNodes.remove(fileNodes);
12762
// System.out.println("directories in root " + filesArr[x]);
12863
treeRoot.add(dirNodes);
12964
listFiles(filesArr[x], dirNodes);
@@ -138,23 +73,16 @@ public static void listRoot(List<Path> directories) {
13873

13974
public static void listFiles(File file, DefaultMutableTreeNode dirNodes) {
14075
File[] filesArr = file.listFiles();
141-
System.out.println("List all files " + Arrays.toString(filesArr));
142-
System.out.println("CHILD 2 DIR " + file.getName());
76+
// System.out.println("List all files " + Arrays.toString(filesArr));
77+
// System.out.println("CHILD 2 DIR " + file.getName());
14378
for (int x = 0; x < filesArr.length; x++) {
14479
if (!filesArr[x].isDirectory()) {
14580
DefaultMutableTreeNode fileNodes = new DefaultMutableTreeNode(filesArr[x].getName()); // level 2 (leaf) node
14681
dirNodes.add(fileNodes);
14782
// System.out.println("files in " + file.getName() + " is " + filesArr[x].getName());
14883
} else {
14984
// listFiles(files0[x], dirNodes);
150-
System.out.println("this is a directory 0 " + filesArr[x].getName());
151-
DefaultMutableTreeNode subDirNodes = new DefaultMutableTreeNode(filesArr[x].getName()); // level 2 (leaf) node
152-
DefaultMutableTreeNode fileNodes = new DefaultMutableTreeNode("amogus"); // level 2 (leaf) node
153-
154-
// subDirNodes.add(fileNodes);
155-
// dirNodes.add(subDirNodes);
156-
listFilesRecursively(filesArr[x], dirNodes, subDirNodes);
157-
// listFilesRecursively2(filesArr[x], dirNodes);
85+
listFilesRecursively2(filesArr[x], dirNodes);
15886

15987
// listFiles(filesArr[x], dirNodes);
16088
}
@@ -172,61 +100,37 @@ public static void listFilesRecursively(File file, DefaultMutableTreeNode dirNod
172100
System.out.println("files in recursive root folder is " + filesArr[x].getName());
173101
} else {
174102
System.out.println("this is a recursive directory XXXXXXXXXXX " + filesArr[x].getName());
175-
176-
listFilesRecursively(filesArr[x], dirNodes, subDirNodes);
103+
DefaultMutableTreeNode dirNodes0 = new DefaultMutableTreeNode(file);
104+
DefaultMutableTreeNode dirNodes1 = new DefaultMutableTreeNode(filesArr[x]);
105+
dirNodes0.add(dirNodes1);
106+
listFilesRecursively(filesArr[x], dirNodes0, subDirNodes);
177107
}
178108
}
179109
dirNodes.add(subDirNodes);
180110
}
181111

182112
public static void listFilesRecursively2(File file, DefaultMutableTreeNode dirNodes) {
183113
DefaultMutableTreeNode subDirNodes = new DefaultMutableTreeNode(file.getName()); // level 2 (leaf) node
184-
// DefaultMutableTreeNode fileNodes = new DefaultMutableTreeNode("amogus"); // level 2 (leaf) node
114+
dirNodes.add(subDirNodes);
185115
File[] filesArr = file.listFiles();
186-
System.out.println("Files in listFilesRecursively " + Arrays.toString(filesArr));
116+
// System.out.println("Files in listFilesRecursively " + Arrays.toString(filesArr));
187117
for (int x = 0; x < filesArr.length; x++) {
188118
if (!filesArr[x].isDirectory()) {
189119
DefaultMutableTreeNode fileNodes = new DefaultMutableTreeNode(filesArr[x].getName()); // level 2 (leaf) node
190120
subDirNodes.add(fileNodes);
191121
subDirNodes.add(fileNodes);
192122
// dirNodes.add(fileNodes);
193-
System.out.println("files in recursive root folder is " + filesArr[x].getName());
123+
// System.out.println("files in recursive root folder is " + filesArr[x].getName());
194124
} else {
195-
System.out.println("this is a directory " + filesArr[x].getName());
196-
// listFilesRecursively(filesArr[x], dirNodes);
125+
// System.out.println("this is a directory " + filesArr[x].getName());
126+
DefaultMutableTreeNode subDirNodes0 = new DefaultMutableTreeNode(filesArr[x].getName()); // level 2 (leaf) node
127+
subDirNodes.add(subDirNodes0);
128+
listFiles(filesArr[x], subDirNodes0);
197129
}
198130
}
199131
dirNodes.add(subDirNodes);
200132
}
201133

202-
public static String[] recursiveDir(File file) {
203-
String[] directories = file.list(new FilenameFilter() {
204-
@Override
205-
public boolean accept(File current, String name) {
206-
return new File(current, name).isDirectory();
207-
}
208-
});
209-
return directories;
210-
}
211-
212-
public static File treeFileFormatter(TreePath[] treePaths) {
213-
File fileFormat = null;
214-
String path = root + masterFolder + treePaths[0].toString().substring(1, treePaths[0].toString().length() - 1).replaceAll(", ", "\\\\");
215-
String fileName = new File(root + masterFolder + treePaths[0].toString().substring(1, treePaths[0].toString().length() - 1).replaceAll(", ", "\\\\")).getName();
216-
// .replaceAll(new File(treePaths[0].toString()).getName(), "");
217-
if (!new File(path).isDirectory()) {
218-
System.out.println("Final path without filename " + path.replaceAll(fileName, ""));
219-
}
220-
for (int i = 0; i < treePaths.length; i++) {
221-
fileFormat = new File(root + masterFolder + treePaths[i].toString().substring(1, treePaths[i].toString().length() - 1).replaceAll(", ", "\\\\"));
222-
if (!fileFormat.isDirectory()) {
223-
System.out.println("files are " + fileFormat);
224-
}
225-
226-
}
227-
return fileFormat;
228-
}
229-
230134
public static void openFile(TreePath treePath) {
231135
File file = null;
232136
file = new File(root + masterFolder + treePath.toString().substring(1, treePath.toString().length() - 1).replaceAll(", ", "\\\\"));

0 commit comments

Comments
 (0)