commit aa8cde90f20b016e4116e78295db8a4d4ff35440
author Robert Burrell Donkin <rdonkin@apache.org> Sun Mar 31 13:47:38 2013 +0000
committer Robert Burrell Donkin <rdonkin@apache.org> Sun Mar 31 13:47:38 2013 +0000
tree 50dd69d70752ef96c6203832493eab92ccb1343a
parent c8bbb2eda40279d77c8f38ff3a038f7134449432

DRY up code

git-svn-id: https://svn.apache.org/repos/asf/creadur/tentacles/trunk@1462952 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/creadur/tentacles/Main.java

diff --git a/src/main/java/org/apache/creadur/tentacles/Main.java b/src/main/java/org/apache/creadur/tentacles/Main.java
index b924ce9..406b0f7 100644
--- a/src/main/java/org/apache/creadur/tentacles/Main.java
+++ b/src/main/java/org/apache/creadur/tentacles/Main.java
@@ -609,11 +609,16 @@
         }
 
         private Map<URI, URI> mapOther() {
-            final File jarContents = contents(this.file);
+            final File jarContents = contents();
             final List<File> legal =
                     Main.this.fileSystem
                             .legalDocumentsUndeclaredIn(jarContents);
 
+            return buildMapFrom(jarContents, legal);
+        }
+
+        private Map<URI, URI> buildMapFrom(final File jarContents,
+                final List<File> legal) {
             final Map<URI, URI> map = new LinkedHashMap<URI, URI>();
             for (final File file : legal) {
                 final URI name = jarContents.toURI().relativize(file.toURI());
@@ -626,19 +631,15 @@
         }
 
         private Map<URI, URI> map() {
-            final File jarContents = contents(this.file);
+            final File jarContents = contents();
             final List<File> legal =
                     Main.this.fileSystem.legalDocumentsDeclaredIn(jarContents);
 
-            final Map<URI, URI> map = new LinkedHashMap<URI, URI>();
-            for (final File file : legal) {
-                final URI name = jarContents.toURI().relativize(file.toURI());
-                final URI link =
-                        Main.this.local.toURI().relativize(file.toURI());
+            return buildMapFrom(jarContents, legal);
+        }
 
-                map.put(name, link);
-            }
-            return map;
+        private File contents() {
+            return Main.this.contents(this.file);
         }
     }