You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by rd...@apache.org on 2011/12/01 21:24:59 UTC

svn commit: r1209225 - in /incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker: legacy/ out/ByOrganisation.java out/Indentation.java out/WithLicense.java out/WithinDirectory.java out/Work.java

Author: rdonkin
Date: Thu Dec  1 20:24:57 2011
New Revision: 1209225

URL: http://svn.apache.org/viewvc?rev=1209225&view=rev
Log:
More building done

Removed:
    incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/legacy/
    incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ByOrganisation.java
    incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Indentation.java
Modified:
    incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithLicense.java
    incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithinDirectory.java
    incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Work.java

Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithLicense.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithLicense.java?rev=1209225&r1=1209224&r2=1209225&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithLicense.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithLicense.java Thu Dec  1 20:24:57 2011
@@ -23,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.rat.whisker.fromxml.JDomBuilder;
+import org.apache.rat.whisker.model.ByOrganisation;
 import org.apache.rat.whisker.model.Organisation;
 import org.jdom.Element;
 
@@ -47,7 +49,7 @@ public class WithLicense implements Comp
     
     public WithLicense(final Element element, final Map<String, License> licenses,
             Map<String, Organisation> organisations) {
-        this(license(element, licenses), element, ByOrganisation.byOrganisation(element, organisations));
+        this(license(element, licenses), element, new JDomBuilder().collectByOrganisations(element, organisations));
     }
         /**
      * @param license

Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithinDirectory.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithinDirectory.java?rev=1209225&r1=1209224&r2=1209225&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithinDirectory.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithinDirectory.java Thu Dec  1 20:24:57 2011
@@ -24,6 +24,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.rat.whisker.fromxml.JDomBuilder;
+import org.apache.rat.whisker.model.ByOrganisation;
 import org.apache.rat.whisker.model.Organisation;
 import org.jdom.Element;
 
@@ -40,7 +42,7 @@ public class WithinDirectory implements 
      */
     private static Collection<ByOrganisation> publicDomain(
             Map<String, Organisation> organisations, Element element) {
-        return ByOrganisation.byOrganisation(element.getChild("public-domain"), organisations);
+        return new JDomBuilder().collectByOrganisations(element.getChild("public-domain"), organisations);
     }
 
 

Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Work.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Work.java?rev=1209225&r1=1209224&r2=1209225&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Work.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Work.java Thu Dec  1 20:24:57 2011
@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.TreeSet;
 
 import org.apache.rat.whisker.fromxml.JDomBuilder;
+import org.apache.rat.whisker.model.ByOrganisation;
 import org.apache.rat.whisker.model.Organisation;
 import org.jdom.Document;
 import org.jdom.Element;