06.03.2017

sustav86 · sustav86 · commit c46c02c495e6 · 2017-03-06T07:24:01.000+02:00
diff --git a/com/javarush/test/level26/lesson15/big01/CashMachine.java b/com/javarush/test/level26/lesson15/big01/CashMachine.java
@@ -11,17 +11,17 @@
 public class CashMachine {
     public static void main(String[] args) {
         Locale.setDefault(Locale.ENGLISH);
-        Operation operation;
-        do {
-            try {
+
+        try {
+            Operation operation;
+            do {
                 operation = ConsoleHelper.askOperation();
                 CommandExecutor.execute(operation);
-            } catch (InterruptOperationException e) {
-                ConsoleHelper.writeMessage("Buy, my dear friend!");
-                break;
-            }
+            } while (operation != Operation.EXIT);
 
-        } while (operation != Operation.EXIT);
+        } catch (InterruptOperationException e) {
+            ConsoleHelper.writeMessage("Buy, my dear friend!");
+        }
 
     }
 }
diff --git a/com/javarush/test/level26/lesson15/big01/ConsoleHelper.java b/com/javarush/test/level26/lesson15/big01/ConsoleHelper.java
@@ -16,19 +16,25 @@ public static void writeMessage(String message) {
         System.out.println(message);
     }
 
-    public static String readString() {
+    public static String readString() throws InterruptOperationException{
         String in = "";
 
         try {
             in = reader.readLine();
+
         }catch (IOException ex) {
+            writeMessage("Wrong choice");
+        }
+
+        if (in.toLowerCase().equals("exit")) {
+            throw new InterruptOperationException();
 
         }
 
         return in;
     }
 
-    public static String askCurrencyCode() {
+    public static String askCurrencyCode() throws InterruptOperationException{
         writeMessage("Enter the currency code.");
         String s = readString();
         while (s.length() != 3)
@@ -39,10 +45,10 @@ public static String askCurrencyCode() {
         return s.toUpperCase();
     }
 
-    public static String[] getValidTwoDigits(String currencyCode) {
+    public static String[] getValidTwoDigits(String currencyCode) throws InterruptOperationException{
         String valueAndAmount;
         String[] result;
-        writeMessage("Input nominal and amount:");
+        writeMessage("Input nominal and amount: " + currencyCode);
 
         while (true) {
             valueAndAmount = readString();
@@ -61,18 +67,13 @@ public static String[] getValidTwoDigits(String currencyCode) {
 
     public static Operation askOperation() throws InterruptOperationException {
         Operation operation;
-        String userChoice = "";
         while (true) {
-            System.out.println("Choose operation: 1 - INFO, 2 - DEPOSIT, 3 - WITHDRAW, 4 - EXIT");
+            writeMessage("Choose operation: 1 - INFO, 2 - DEPOSIT, 3 - WITHDRAW, 4 - EXIT");
             try {
-                userChoice = readString();
-                operation = Operation.getAllowableOperationByOrdinal(Integer.parseInt(userChoice));
+                operation = Operation.getAllowableOperationByOrdinal(Integer.parseInt(readString()));
                 break;
             }catch (IllegalArgumentException ex) {
-                if (userChoice.toLowerCase().equals("exit")) throw new InterruptOperationException();
-                System.out.println("Wrong choice. Choose operation: 1 - INFO, 2 - DEPOSIT, 3 - WITHDRAW, 4 - EXIT");
-            }catch (Exception ex) {
-                System.out.println("Wrong choice. Choose operation: 1 - INFO, 2 - DEPOSIT, 3 - WITHDRAW, 4 - EXIT");
+                writeMessage("Wrong choice");
             }
 
         }
diff --git a/com/javarush/test/level26/lesson15/big01/command/Command.java b/com/javarush/test/level26/lesson15/big01/command/Command.java
@@ -1,8 +1,10 @@
 package com.javarush.test.level26.lesson15.big01.command;
 
+import com.javarush.test.level26.lesson15.big01.exception.InterruptOperationException;
+
 /**
  * Created by SUSTAVOV on 06.01.2017.
  */
 interface Command {
-    void execute();
+    void execute() throws InterruptOperationException;
 }
diff --git a/com/javarush/test/level26/lesson15/big01/command/CommandExecutor.java b/com/javarush/test/level26/lesson15/big01/command/CommandExecutor.java
@@ -1,6 +1,7 @@
 package com.javarush.test.level26.lesson15.big01.command;
 
 import com.javarush.test.level26.lesson15.big01.Operation;
+import com.javarush.test.level26.lesson15.big01.exception.InterruptOperationException;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,7 +18,7 @@ public final class CommandExecutor {
         operationCommandMap.put(Operation.EXIT, new ExitCommand());
     }
 
-    public static final void execute(Operation operation) {
+    public static final void execute(Operation operation) throws InterruptOperationException {
         if (operationCommandMap.containsKey(operation)) {
             operationCommandMap.get(operation).execute();
         }
diff --git a/com/javarush/test/level26/lesson15/big01/command/DepositCommand.java b/com/javarush/test/level26/lesson15/big01/command/DepositCommand.java
@@ -3,13 +3,14 @@
 import com.javarush.test.level26.lesson15.big01.ConsoleHelper;
 import com.javarush.test.level26.lesson15.big01.CurrencyManipulator;
 import com.javarush.test.level26.lesson15.big01.CurrencyManipulatorFactory;
+import com.javarush.test.level26.lesson15.big01.exception.InterruptOperationException;
 
 /**
  * Created by SUSTAVOV on 06.01.2017.
  */
 class DepositCommand implements Command {
     @Override
-    public void execute() {
+    public void execute() throws InterruptOperationException{
         String currencyCode = ConsoleHelper.askCurrencyCode();
         CurrencyManipulator currencyManipulator = CurrencyManipulatorFactory.getManipulatorByCurrencyCode(currencyCode);
         String[] valueQuantityBanknotes = ConsoleHelper.getValidTwoDigits(currencyCode);
diff --git a/com/javarush/test/level26/lesson15/big01/command/ExitCommand.java b/com/javarush/test/level26/lesson15/big01/command/ExitCommand.java
@@ -1,13 +1,20 @@
 package com.javarush.test.level26.lesson15.big01.command;
 
+import com.javarush.test.level26.lesson15.big01.ConsoleHelper;
+import com.javarush.test.level26.lesson15.big01.exception.InterruptOperationException;
+
 /**
  * Created by SUSTAVOV on 06.01.2017.
  */
 class ExitCommand implements Command {
-    @Override
-    public void execute() {
-
 
+    @Override
+    public void execute() throws InterruptOperationException{
+        ConsoleHelper.writeMessage("Aru you sure you want to exit? <y, n>");
+        if (ConsoleHelper.readString().toLowerCase().equals("y")) {
+            ConsoleHelper.writeMessage("Bye");
+            throw new InterruptOperationException();
+        }
 
     }
 }
diff --git a/com/javarush/test/level26/lesson15/big01/command/InfoCommand.java b/com/javarush/test/level26/lesson15/big01/command/InfoCommand.java
@@ -1,18 +1,19 @@
 package com.javarush.test.level26.lesson15.big01.command;
 
+import com.javarush.test.level26.lesson15.big01.ConsoleHelper;
 import com.javarush.test.level26.lesson15.big01.CurrencyManipulator;
 import com.javarush.test.level26.lesson15.big01.CurrencyManipulatorFactory;
+import com.javarush.test.level26.lesson15.big01.exception.InterruptOperationException;
 
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
+
 
 /**
  * Created by SUSTAVOV on 06.01.2017.
  */
 class InfoCommand implements Command {
     @Override
-    public void execute() {
+    public void execute() throws InterruptOperationException {
 //        if (!CurrencyManipulatorFactory.hasMoney()) {
 //            System.out.println("No money available.");
 //        } else {
@@ -47,7 +48,7 @@ public void execute() {
             }
         }
         if (count == 0) {
-            System.out.println("No money available.");
+            ConsoleHelper.writeMessage("No money available.");
         }
     }
 }
diff --git a/com/javarush/test/level26/lesson15/big01/command/WithdrawCommand.java b/com/javarush/test/level26/lesson15/big01/command/WithdrawCommand.java
@@ -1,11 +1,13 @@
 package com.javarush.test.level26.lesson15.big01.command;
 
+import com.javarush.test.level26.lesson15.big01.exception.InterruptOperationException;
+
 /**
  * Created by SUSTAVOV on 06.01.2017.
  */
 class WithdrawCommand implements Command {
     @Override
-    public void execute() {
+    public void execute() throws InterruptOperationException{
 
     }
 }
diff --git a/com/javarush/test/level30/lesson08/home01/Pair.java b/com/javarush/test/level30/lesson08/home01/Pair.java
@@ -0,0 +1,22 @@
+package com.javarush.test.level30.lesson08.home01;
+
+public class Pair {
+    private int x;
+    private int y;
+
+    public Pair(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("x=%d, y=%d", x, y);
+    }
+
+    public void swap() {
+        x = x ^ y;
+        y = x ^ y;
+        x = y ^ x;
+    }
+}
diff --git a/com/javarush/test/level30/lesson08/home01/Solution.java b/com/javarush/test/level30/lesson08/home01/Solution.java
@@ -0,0 +1,30 @@
+package com.javarush.test.level30.lesson08.home01;
+
+/* Swap по-новому
+В классе Pair реализуйте метод swap, который должен для x, y менять местами их значения.
+Можно использовать только операции 1)исключающее или, 2) присваивание
+Не оставляйте комментарии, не меняйте остальной код
+*/
+public class Solution {
+    public static void main(String[] args) {
+        Pair pair = new Pair(4, 5);
+        System.out.println(pair);
+        pair.swap();
+        System.out.println(pair);
+
+        String a = new String("hello");
+        String b = new String(a);
+        String c = a;
+        char[] d = {'h', 'e', 'l', 'l', 'o'};
+        System.out.println(a == "hello");
+        System.out.println(a.equals(d));
+        System.out.println(a.equals(b));
+        System.out.println(a == c);
+        System.out.println(a == b);
+
+        int result = 12 + 2 * 5 % 3 - 15 / 4;
+        String x = 12 - 6 + "Hello" + 7 + 5;
+
+        System.out.println(result + " - " + x);
+    }
+}
diff --git a/com/javarush/test/level31/lesson02/home01/Solution.java b/com/javarush/test/level31/lesson02/home01/Solution.java
@@ -0,0 +1,73 @@
+package com.javarush.test.level31.lesson02.home01;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Set;
+import java.util.TreeSet;
+
+/* Проход по дереву файлов
+1. На вход метода main подаются два параметра.
+Первый - path - путь к директории, второй - resultFileAbsolutePath - имя файла, который будет содержать результат.
+2. Для каждого файла в директории path и в ее всех вложенных поддиректориях выполнить следующее:
+2.1. Если у файла длина в байтах больше 50, то удалить его.
+2.2. Если у файла длина в байтах НЕ больше 50, то для всех таких файлов:
+2.2.1. отсортировать их по имени файла в возрастающем порядке, путь не учитывать при сортировке
+2.2.2. переименовать resultFileAbsolutePath в 'allFilesContent.txt'
+2.2.3. в allFilesContent.txt последовательно записать содержимое всех файлов из п. 2.2.1. Тела файлов разделять "\n"
+2.3. Удалить директории без файлов (пустые).
+Все файлы имеют расширение txt.
+*/
+public class Solution {
+    public static void main(String[] args) {
+        if (args.length < 2) return;
+
+        File path = new File(args[0]);
+        File resultFileAbsolutePath = new File(args[1]);
+        Set<File> allFiles = new TreeSet<>();
+        walkingByDirectories(path, allFiles);
+        File allFilesContent = new File(resultFileAbsolutePath.getParent() + "\\allFilesContent.txt");
+        resultFileAbsolutePath.renameTo(allFilesContent);
+        try {
+            FileInputStream input = null;
+            FileOutputStream out = new FileOutputStream(allFilesContent);
+            for (File currentFile : allFiles) {
+                input = new FileInputStream(currentFile);
+                out.write(input.read(new byte[(int) currentFile.length()]));
+                out.write(new String(Files.readAllBytes(Paths.get(currentFile.getAbsolutePath()))).getBytes());
+//                out.write("\\n");
+
+            }
+            out.close();
+        } catch (java.io.IOException e) {
+            e.printStackTrace();
+        }
+
+
+
+
+    }
+
+    public static void walkingByDirectories(File path, Set<File> allFiles) {
+        for (File file : path.listFiles()) {
+            if (file.isDirectory()) {
+                if (file.list().length == 0) {
+                    file.delete();
+                } else {
+                    walkingByDirectories(file, allFiles);
+                }
+            } else {
+                if (file.length() > 50) {
+                    file.delete();
+                } else {
+                    allFiles.add(file);
+                }
+            }
+        }
+
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.javarush.test.level26.lesson15.big01.command;`
`2`	`2`
`3`	`3`	`import com.javarush.test.level26.lesson15.big01.Operation;`
	`4`	`+import com.javarush.test.level26.lesson15.big01.exception.InterruptOperationException;`
`4`	`5`
`5`	`6`	`import java.util.HashMap;`
`6`	`7`	`import java.util.Map;`
`@@ -17,7 +18,7 @@ public final class CommandExecutor {`
`17`	`18`	`operationCommandMap.put(Operation.EXIT, new ExitCommand());`
`18`	`19`	`}`
`19`	`20`
`20`		`- public static final void execute(Operation operation) {`
	`21`	`+ public static final void execute(Operation operation) throws InterruptOperationException {`
`21`	`22`	`if (operationCommandMap.containsKey(operation)) {`
`22`	`23`	`operationCommandMap.get(operation).execute();`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,19 @@`
`1`	`1`	`package com.javarush.test.level26.lesson15.big01.command;`
`2`	`2`
	`3`	`+import com.javarush.test.level26.lesson15.big01.ConsoleHelper;`
`3`	`4`	`import com.javarush.test.level26.lesson15.big01.CurrencyManipulator;`
`4`	`5`	`import com.javarush.test.level26.lesson15.big01.CurrencyManipulatorFactory;`
	`6`	`+import com.javarush.test.level26.lesson15.big01.exception.InterruptOperationException;`
`5`	`7`
`6`	`8`	`import java.util.Collection;`
`7`		`-import java.util.Collections;`
`8`		`-import java.util.Map;`
	`9`	`+`
`9`	`10`
`10`	`11`	`/**`
`11`	`12`	`* Created by SUSTAVOV on 06.01.2017.`
`12`	`13`	`*/`
`13`	`14`	`class InfoCommand implements Command {`
`14`	`15`	`@Override`
`15`		`- public void execute() {`
	`16`	`+ public void execute() throws InterruptOperationException {`
`16`	`17`	`// if (!CurrencyManipulatorFactory.hasMoney()) {`
`17`	`18`	`// System.out.println("No money available.");`
`18`	`19`	`// } else {`
`@@ -47,7 +48,7 @@ public void execute() {`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`if (count == 0) {`
`50`		`- System.out.println("No money available.");`
	`51`	`+ ConsoleHelper.writeMessage("No money available.");`
`51`	`52`	`}`
`52`	`53`	`}`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
`1`	`1`	`package com.javarush.test.level26.lesson15.big01.command;`
`2`	`2`
	`3`	`+import com.javarush.test.level26.lesson15.big01.exception.InterruptOperationException;`
	`4`	`+`
`3`	`5`	`/**`
`4`	`6`	`* Created by SUSTAVOV on 06.01.2017.`
`5`	`7`	`*/`
`6`	`8`	`class WithdrawCommand implements Command {`
`7`	`9`	`@Override`
`8`		`- public void execute() {`
	`10`	`+ public void execute() throws InterruptOperationException{`
`9`	`11`
`10`	`12`	`}`
`11`	`13`	`}`