- Fixed bug deleting directories with files and/or subfolders in the Directory class.

 - Removed debug print statement in the Image class.

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@1619 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff

Author: pborissow

src/javaxt/io/Directory.java

@@ -286,8 +286,9 @@ public boolean isEmpty(){
   //**************************************************************************
   //** Create Directory
   //**************************************************************************
-  /**  Used to create the directory. */
-
+  /** Used to create the directory. Returns true if the directory was
+   *  successfully created.
+   */
     public boolean create(){
         return getFile().mkdirs();
     }
@@ -296,9 +297,70 @@ public boolean create(){
   //**************************************************************************
   //** Delete Directory
   //**************************************************************************
-  /**  Used to delete the directory. */
-
+  /** Used to delete the directory. Returns true if the directory was
+   *  successfully deleted.
+   */
     public boolean delete(){
+
+
+      //Delete files and generate an ordered list of subfolders
+        TreeMap<Integer, HashSet<java.io.File>> paths = new TreeMap<>();
+        List files = getChildren(true, null, false);
+        Object obj;
+        while (true){
+            synchronized (files) {
+                while (files.isEmpty()) {
+                    try {
+                        files.wait();
+                    }
+                    catch (InterruptedException e) {
+                        break;
+                    }
+                }
+                obj = files.remove(0);
+                files.notifyAll();
+            }
+
+
+            if (obj==null){ //file search is complete
+                break;
+            }
+            else{
+                if (obj instanceof javaxt.io.File){
+                    javaxt.io.File f = (javaxt.io.File) obj;
+                    f.delete();
+                }
+                else{
+                    javaxt.io.Directory dir = (javaxt.io.Directory) obj;
+
+                    int numFolders = 0;
+                    javaxt.io.Directory d = dir.clone();
+                    while (!d.equals(this)){
+                        d = d.getParentDirectory();
+                        numFolders++;
+                    }
+
+
+                    HashSet<java.io.File> set = paths.get(numFolders);
+                    if (set==null){
+                        set = new HashSet<>();
+                        paths.put(numFolders, set);
+                    }
+                    set.add(dir.toFile());
+                }
+            }
+        }
+
+
+      //Delete subfolders
+        for (Integer numFolders : paths.descendingKeySet()){
+            for (java.io.File d : paths.get(numFolders)){
+                d.delete();
+            }
+        }
+
+
+
         if (getFile().delete()){
             attr = null;
             return true;

src/javaxt/io/Image.java

@@ -2086,7 +2086,7 @@ public IIOMetadataNode[] getUnknownTags(int MarkerTag){
                     if (marker==MarkerTag) markers.add((IIOMetadataNode) unknownNode);
                 }
                 catch(Exception e){
-                    e.printStackTrace();
+                    //e.printStackTrace();
                 }
             }
         }