From 581289083115b2a2747c706ea45e148e6318e2fd Mon Sep 17 00:00:00 2001 From: hneemann Date: Tue, 16 May 2017 19:52:10 +0200 Subject: [PATCH] count files added to the library --- .../digital/draw/library/ElementLibrary.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java b/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java index 8ca79988e..626a359ca 100644 --- a/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java +++ b/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java @@ -282,7 +282,8 @@ public class ElementLibrary implements Iterable changedNode = customNode; } - scanFolder(rootLibraryPath, customNode); + int num = scanFolder(rootLibraryPath, customNode); + LOGGER.debug("found " + num + " files"); } else if (customNode != null) { root.remove(customNode); customNode = null; @@ -305,7 +306,8 @@ public class ElementLibrary implements Iterable l.libraryChanged(node); } - private void scanFolder(File path, LibraryNode node) { + private int scanFolder(File path, LibraryNode node) { + int num = 0; File[] list = path.listFiles(); if (list != null) { ArrayList orderedList = new ArrayList<>(Arrays.asList(list)); @@ -313,17 +315,20 @@ public class ElementLibrary implements Iterable for (File f : orderedList) { if (f.isDirectory()) { LibraryNode n = new LibraryNode(f.getName()); - scanFolder(f, n); + num += scanFolder(f, n); if (!n.isEmpty()) node.add(n); } } for (File f : orderedList) { final String name = f.getName(); - if (f.isFile() && name.endsWith(".dig")) + if (f.isFile() && name.endsWith(".dig")) { node.add(new LibraryNode(f)); + num++; + } } } + return num; } /**