commit f35b1cef767167b67b2fc9f68b511469ee39762a
author Guillaume Nodet <gnodet@apache.org> Mon Mar 23 15:50:09 2009 +0000
committer Guillaume Nodet <gnodet@apache.org> Mon Mar 23 15:50:09 2009 +0000
tree 166265d837f3fd593e118b5d193ae9a805a7499a
parent ecde4adc89adb1a12ae2c6966a5b87814701db89

Fix StackOverflowError and enhance display of files

git-svn-id: https://svn.apache.org/repos/asf/geronimo/gshell/trunk@757419 13f79535-47bb-0310-9956-ffa450edef68

gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java

diff --git a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java
index 92bf65c..dd75ba5 100644
--- a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java
+++ b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java
@@ -19,6 +19,8 @@
 
 package org.apache.geronimo.gshell.commands.shell;
 
+import java.net.URI;
+
 import org.apache.commons.vfs.FileObject;
 import org.apache.commons.vfs.FileSelectInfo;
 import org.apache.commons.vfs.FileSelector;
@@ -81,7 +83,7 @@
         find(context, root, selector);
 
         FileObjects.close(root);
-        
+
         return CommandAction.Result.SUCCESS;
     }
 
@@ -94,21 +96,23 @@
 
         if (files != null && files.length != 0) {
             for (FileObject child : files) {
-                display(context, child);
-
-                if (child.getType().hasChildren()) {
-                    find(context, child, selector);
-                }
+                display(context, child, file);
             }
         }
     }
 
-    private void display(final CommandContext context, final FileObject file) throws FileSystemException {
+    private void display(final CommandContext context, final FileObject file, final FileObject root) throws FileSystemException {
         assert context != null;
         assert file != null;
 
+        String path;
+        try {
+            path = new URI(this.path).resolve(root.getURL().toURI().relativize(file.getURL().toURI())).toString();
+        } catch (Exception e) {
+            path = file.getName().getPath();
+        }
         IO io = context.getIo();
-        io.info(file.getName().getPath());
+        io.info(path);
     }
 
     //
@@ -128,7 +132,7 @@
 
         public TypeSelector(final Type type) {
             assert type != null;
-            
+
             this.type = type;
 
             log.trace("Type: {}", type);
@@ -161,7 +165,7 @@
     //
     // NameSelector
     //
-    
+
     private class NameSelector
         implements FileSelector
     {
@@ -187,7 +191,7 @@
         }
 
         public NameSelector(final String name) throws MalformedPatternException {
-            this(name, false);    
+            this(name, false);
         }
 
         public boolean includeFile(final FileSelectInfo selection) throws Exception {