- Revision
- 1331
- Author
- mauro
- Date
- 2009-10-13 17:49:59 -0500 (Tue, 13 Oct 2009)
Log Message
JBEHAVE-187: Display data file content using relative paths.
Modified Paths
- trunk/web/web-io/src/main/java/org/jbehave/web/io/ArchivingFileManager.java
- trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/FilesController.java
- trunk/web/web-runner/src/main/webapp/ftl/data/files.ftl
- trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/FilesControllerTest.java
Diff
Modified: trunk/web/web-io/src/main/java/org/jbehave/web/io/ArchivingFileManager.java (1330 => 1331)
--- trunk/web/web-io/src/main/java/org/jbehave/web/io/ArchivingFileManager.java 2009-10-13 22:24:03 UTC (rev 1330) +++ trunk/web/web-io/src/main/java/org/jbehave/web/io/ArchivingFileManager.java 2009-10-13 22:49:59 UTC (rev 1331) @@ -38,7 +38,12 @@ } public List<File> listContent(String path){ - return archiver.listContent(archiver.directoryOf(new File(path))); + File directory = archiver.directoryOf(new File(path)); + List<File> content = new ArrayList<File>(); + for ( File file : archiver.listContent(directory) ){ + content.add(archiver.relativeTo(file, directory)); + } + return content; } public void delete(List<String> paths) {
Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/FilesController.java (1330 => 1331)
--- trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/FilesController.java 2009-10-13 22:24:03 UTC (rev 1330) +++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/FilesController.java 2009-10-13 22:49:59 UTC (rev 1331) @@ -2,7 +2,9 @@ import java.io.File; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.codehaus.waffle.action.annotation.ActionMethod; import org.codehaus.waffle.menu.Menu; @@ -14,7 +16,7 @@ private final FileManager manager; private List<File> files = new ArrayList<File>(); private List<String> selectedPaths = new ArrayList<String>(); - private List<File> contentFiles = new ArrayList<File>(); + private Map<String,List<File>> contentFiles = new HashMap<String,List<File>>(); public FilesController(Menu menu, FileManager manager) { super(menu); @@ -27,10 +29,10 @@ } @ActionMethod - public void listContent() { + public void showContent() { contentFiles.clear(); for (String path : selectedPaths) { - contentFiles.addAll(manager.listContent(path)); + contentFiles.put(path, manager.listContent(path)); } } @@ -49,7 +51,7 @@ return files; } - public List<File> getContentFiles() { + public Map<String, List<File>> getContentFiles() { return contentFiles; }
Modified: trunk/web/web-runner/src/main/webapp/ftl/data/files.ftl (1330 => 1331)
--- trunk/web/web-runner/src/main/webapp/ftl/data/files.ftl 2009-10-13 22:24:03 UTC (rev 1330) +++ trunk/web/web-runner/src/main/webapp/ftl/data/files.ftl 2009-10-13 22:49:59 UTC (rev 1331) @@ -17,8 +17,8 @@ <table> <#list files as file> <tr> - <td>${file.absolutePath}</td> - <td><@w.checkbox "selectedPaths" "${file.absolutePath}" /></td> + <td>${file.path}</td> + <td><@w.checkbox "selectedPaths" "${file.path}" /></td> </tr> </#list> </table> @@ -32,10 +32,12 @@ <fieldset> <legend><@i.messageFor "contentFiles" "Content Files"/></legend> <table> - <#list contentFiles as file> - <tr> - <td>${file.absolutePath}</td> - </tr> + <#list contentFiles.keySet() as path> + <#assign files=contentFiles.get(path)> + <tr><td>${path}</td></tr> + <#list files as file> + <tr><td class="contentFilePath">${file.path}</td></tr> + </#list> </#list> </table> </fieldset> @@ -47,7 +49,7 @@ <legend><@i.messageFor "actions" "Actions"/></legend> <p> <a class="buttonDelete" "delete" "Delete"/></a> - <a class="buttonDelete" "listContent" "List Content"/></a> + <a class="buttonDelete" "showContent" "Show Content"/></a> <a class="buttonDelete" "hideContent" "Hide Content"/></a> </p> </fieldset>
Modified: trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/FilesControllerTest.java (1330 => 1331)
--- trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/FilesControllerTest.java 2009-10-13 22:24:03 UTC (rev 1330) +++ trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/FilesControllerTest.java 2009-10-13 22:49:59 UTC (rev 1331) @@ -51,8 +51,8 @@ }); FilesController controller = new FilesController(MENU, manager); controller.setSelectedPaths(paths); - controller.listContent(); - assertEquals(files, controller.getContentFiles()); + controller.showContent(); + assertEquals(files, controller.getContentFiles().get("archive1")); } @Test
To unsubscribe from this list please visit:
