Merge pull request #2393

newMain

Author: oldSorcerer

1.JavaSyntax/src/com/javarush/task/pro/task12/task1227/Solution.java

@@ -18,23 +18,25 @@ public class Solution {
 
     public static void main(String[] args) {
         rescueRobots();
+        printList(cableContents);
         emptyGarbageBin();
         printList(rescuedRobots);
     }
 
     public static void rescueRobots() {
         for (int i = 0; i < cableContents.size(); i++) {
             Robot robot = cableContents.get(i);
-            if (robot.getName().equals("Amigo")) {
-                rescuedRobots.add(robot);
-                cableContents.remove(robot);
-                i--;
-            } else if (robot.getName().equals("Diego")) {
+            if (robot.getName().equals("Amigo") || robot.getName().equals("Diego")) {
                 rescuedRobots.add(robot);
                 cableContents.remove(robot);
                 i--;
             }
         }
+//        List<Robot> list = cableContents.stream()
+//                .filter(robot -> robot.getName().equals("Amigo") || robot.getName().equals("Diego"))
+//                .toList();
+//        cableContents.removeAll(list);
+//        rescuedRobots.addAll(list);
     }
 
     private static void emptyGarbageBin() {
@@ -43,8 +45,8 @@ private static void emptyGarbageBin() {
     }
 
     public static void printList(List<Robot> list) {
-        for (Robot o : list) {
-            System.out.print(o + " ");
+        for (Robot robot : list) {
+            System.out.print(robot + " ");
         }
         System.out.println();
     }

1.JavaSyntax/src/com/javarush/task/pro/task17/task1701/Solution.java

@@ -5,4 +5,4 @@ public static void main(String[] args) {
         Bat bat = new Bat();
         bat.move();
     }
-}
+}

4.JavaCollections/src/com/javarush/task/task32/task3204/Solution.java

@@ -21,7 +21,9 @@ public static ByteArrayOutputStream getPassword() {
 
         char[] password = new char[8];
         String string = "";
-        while (!string.matches(".*\\d.*") || !string.matches(".*[a-z].*") || !string.matches(".*[A-Z].*")) {
+        while (!string.matches(".*\\d.*") ||
+                !string.matches(".*\\p{Ll}.*") ||
+                !string.matches(".*\\p{Lu}.*")) {
             for (int i = 0; i < password.length; i++) {
                 password[i] = template.charAt(new Random().nextInt(template.length()));
             }

4.JavaCollections/src/com/javarush/task/task37/task3707/AmigoSet.java

@@ -7,9 +7,8 @@
 
 public class AmigoSet<E> extends AbstractSet<E> implements Serializable, Cloneable, Set<E> {
 
-    private static final Object PRESENT = new Object();
-
     private transient HashMap<E, Object> map;
+    private static final Object PRESENT = new Object();
 
     public AmigoSet() {
         this.map = new HashMap<>();
@@ -35,7 +34,6 @@ public int size() {
         return map.size();
     }
 
-
     @Override
     public boolean isEmpty() {
         return map.isEmpty();