OSDN Git Service

perf: using stream and foreach instead v1.2.2
authorhizumiaoba <56146205+hizumiaoba@users.noreply.github.com>
Wed, 15 Sep 2021 06:55:32 +0000 (15:55 +0900)
committerhizumiaoba <56146205+hizumiaoba@users.noreply.github.com>
Wed, 15 Sep 2021 06:55:32 +0000 (15:55 +0900)
src/com/ranfa/lib/Scraping.java
src/com/ranfa/main/DelesteRandomSelector.java

index cfac2da..f0b650a 100644 (file)
@@ -104,10 +104,9 @@ public class Scraping {
                if(attribute.equals(NONSELECTED)) {
                        res = data;
                } else {
-                       for(int i = 0; i < data.size(); i ++) {
-                               if(data.get(i).getAttribute().equals(attribute))
-                                       res.add(data.get(i));
-                       }
+                       data.stream()
+                       .filter(element -> element.getAttribute().equals(attribute))
+                       .forEach(res::add);
                }
                return res;
        }
@@ -132,10 +131,9 @@ public class Scraping {
                if(difficulty.equals(NONSELECTED)) {
                        res = data;
                } else {
-                       for(int i = 0; i < data.size(); i++) {
-                               if(data.get(i).getDifficulty().equals(difficulty))
-                                       res.add(data.get(i));
-                       }
+                       data.stream()
+                       .filter(element -> element.getDifficulty().equals(difficulty))
+                       .forEach(res::add);
                }
                return res;
        }
@@ -151,25 +149,22 @@ public class Scraping {
                        return getOnlyLevelSongs(data, level);
                ArrayList<Song> res = new ArrayList<Song>();
                if(isLess) {
-                       for(int i = 0; i < data.size(); i++) {
-                               if(data.get(i).getLevel() < level)
-                                       res.add(data.get(i));
-                       }
+                       data.stream()
+                       .filter(element -> element.getLevel() < level)
+                       .forEach(res::add);
                } else if (isMore) {
-                       for (int i = 0; i < data.size(); i++) {
-                               if(data.get(i).getLevel() > level)
-                                       res.add(data.get(i));
-                       }
+                       data.stream()
+                       .filter(element -> element.getLevel() > level)
+                       .forEach(res::add);
                }
                return res;
        }
 
        private static ArrayList<Song> getOnlyLevelSongs(ArrayList<Song> data, int level) {
                ArrayList<Song> res = new ArrayList<Song>();
-               for(int i = 0; i < data.size(); i++) {
-                       if(data.get(i).getLevel() == level)
-                               res.add(data.get(i));
-               }
+               data.stream()
+               .filter(element -> element.getLevel() == level)
+               .forEach(res::add);
                return res;
 
        }
index a01461d..164ca28 100644 (file)
@@ -37,7 +37,7 @@ import com.ranfa.lib.Song;
 import com.ranfa.lib.TwitterIntegration;
 import com.ranfa.lib.Version;
 
-@Version(major = 1, minor = 2, patch = 1)
+@Version(major = 1, minor = 2, patch = 2)
 public class DelesteRandomSelector extends JFrame {
 
        private static ArrayList<Song> selectedSongsList = new ArrayList<Song>();