update

Author: maxxbw

lib/utils/CollectionUtil.java

@@ -0,0 +1,34 @@
+package javaToolkit.lib.utils;
+
+import java.util.*;
+
+public class CollectionUtil {
+
+    /**
+     * https://stackoverflow.com/a/109389/4315608
+     *
+     * @param map
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    public static <K, V> Map<K, V> sortByValue(Map<K, V> map) {
+        List<Map.Entry<K, V>> list = new LinkedList<>(map.entrySet());
+        Collections.sort(list, new Comparator<Object>() {
+            @SuppressWarnings("unchecked")
+            public int compare(Object o1, Object o2) {
+                return ((Comparable<V>) ((Map.Entry<K, V>) (o1)).getValue()).compareTo(((Map.Entry<K, V>) (o2)).getValue());
+            }
+        });
+
+        Map<K, V> result = new LinkedHashMap<>();
+        for (Iterator<Map.Entry<K, V>> it = list.iterator(); it.hasNext(); ) {
+            Map.Entry<K, V> entry = (Map.Entry<K, V>) it.next();
+            result.put(entry.getKey(), entry.getValue());
+        }
+
+        return result;
+    }
+
+
+}

lib/utils/DiffUtil.java

@@ -5,7 +5,7 @@
 
 public class DiffUtil {
 
-    public static List<Integer> getChangedLineNumList(String diffFilePath) {
+    public static List<Integer> getChangedLineNumListInOldVersion(String diffFilePath) {
 
         List<Integer> changedLineNumList = new ArrayList<>();
         try {
@@ -31,6 +31,32 @@ public static List<Integer> getChangedLineNumList(String diffFilePath) {
         return changedLineNumList;
     }
 
+    public static List<Integer> getChangedLineNumListInNewVersion(String diffFilePath) {
+
+        List<Integer> changedLineNumList = new ArrayList<>();
+        try {
+            List<String> diffFileStrList = FileUtil.readFileToStrList(diffFilePath);
+            for (String line : diffFileStrList) {
+                if (line.startsWith("@@")) {
+                    for (String tmp : line.split(" ")) {
+                        if (tmp.trim().startsWith("+")) {
+                            if (tmp.contains(",")) {
+                                changedLineNumList.add(Integer.valueOf(tmp.trim().replace("-", "").split(",")[0]));
+                            } else {
+                                changedLineNumList.add(Integer.valueOf(tmp.trim().replace("-", "")));
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            // TODO: handle exception
+            System.out.println(diffFilePath);
+            System.exit(0);
+        }
+        return changedLineNumList;
+    }
+
     public static List<String> getModifiedFileList(String diffFilePath) {
         /**
          * can to be further improved in future