version 1.0.7

jensdietrich · Jun 24, 2020 · 514f3db · 514f3db
1 parent c81ccdb
commit 514f3db
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,10 +4,10 @@
   <groupId>nz.ac.wgtn.yamf</groupId>
   <artifactId>yamf-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.6</version>
+  <version>1.0.7</version>
   <name>yamf-parent</name>
   <properties>
-      <project-version>1.0.6</project-version>
+      <project-version>1.0.7</project-version>
       <maven.compiler.target>1.8</maven.compiler.target>
       <maven.compiler.source>1.8</maven.compiler.source>
   </properties>

diff --git a/yamf-acceptancetests/pom.xml b/yamf-acceptancetests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>nz.ac.wgtn.yamf</groupId>
     <artifactId>yamf-parent</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
   </parent>
   <groupId>nz.ac.wgtn.yamf</groupId>
   <artifactId>yamf-acceptancetests</artifactId>

diff --git a/yamf-bytecodechecks/pom.xml b/yamf-bytecodechecks/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>nz.ac.wgtn.yamf</groupId>
     <artifactId>yamf-parent</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
   </parent>
   <groupId>nz.ac.wgtn.yamf</groupId>
   <artifactId>yamf-bytecodechecks</artifactId>

diff --git a/yamf-core/pom.xml b/yamf-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>nz.ac.wgtn.yamf</groupId>
         <artifactId>yamf-parent</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
     </parent>
   <groupId>nz.ac.wgtn.yamf</groupId>
   <artifactId>yamf-core</artifactId>

diff --git a/yamf-core/src/main/java/nz/ac/wgtn/yamf/commons/Files.java b/yamf-core/src/main/java/nz/ac/wgtn/yamf/commons/Files.java
@@ -19,6 +19,34 @@ public static String relativize(File file, File baseFolder) {
         return pathBase.relativize(pathAbsolute).toString();
     }
 
+    /**
+     * Find an ancestor satidfying a certain condition.
+     * @param file
+     * @param condition
+     * @param includeSelf -- whether file is also being considered
+     * @return
+     */
+    public static File findAncestorSuchThat(File file, Predicate<File> condition, boolean includeSelf) {
+        Preconditions.checkNotNull(file);
+        Preconditions.checkArgument(file.exists());
+        if (includeSelf && condition.test(file)) {
+            return file;
+        }
+        return doFindAncestorSuchThat(file.getParentFile(),condition);
+    }
+
+    private static File doFindAncestorSuchThat(File file, Predicate<File> condition) {
+        if (condition.test(file)) {
+            return file;
+        }
+        File parent = file.getParentFile();
+        if (parent==null) {
+            return null;
+        }
+        else {
+            return doFindAncestorSuchThat(parent,condition);
+        }
+    }
 
     /**
      * Breath-first traverse children to find a child file or folder satisfying a condition.

diff --git a/yamf-examples/pom.xml b/yamf-examples/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>nz.ac.wgtn.yamf</groupId>
     <artifactId>yamf-parent</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
   </parent>
   <groupId>nz.ac.wgtn.yamf</groupId>
   <artifactId>yamf-examples</artifactId>

diff --git a/yamf-msoffice-reporting/pom.xml b/yamf-msoffice-reporting/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>nz.ac.wgtn.yamf</groupId>
         <artifactId>yamf-parent</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
     </parent>
   <groupId>nz.ac.wgtn.yamf</groupId>
   <artifactId>yamf-msoffice-reporting</artifactId>

diff --git a/yamf-mvn/pom.xml b/yamf-mvn/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>nz.ac.wgtn.yamf</groupId>
     <artifactId>yamf-parent</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
   </parent>
   <groupId>nz.ac.wgtn.yamf</groupId>
   <artifactId>yamf-mvn</artifactId>