diff --git a/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-1.gif b/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-1.gif deleted file mode 100644 index ca29dca..0000000 Binary files a/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-1.gif and /dev/null differ diff --git a/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-2.gif b/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-2.gif deleted file mode 100644 index 9465d61..0000000 Binary files a/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-2.gif and /dev/null differ diff --git a/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-3.gif b/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-3.gif deleted file mode 100644 index 53d45e8..0000000 Binary files a/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-3.gif and /dev/null differ diff --git a/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-4.gif b/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-4.gif deleted file mode 100644 index 2c3602e..0000000 Binary files a/semester-4/ОПJа/lb-4/part5-gifs/part5-demo-4.gif and /dev/null differ diff --git a/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part1.java b/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part1.java index 0e9b087..79df655 100644 --- a/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part1.java +++ b/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part1.java @@ -34,7 +34,9 @@ public class Part1 { if (input.equalsIgnoreCase("stop")) { break; - } else if (input.equals("Latn")) { + } + + if (input.equals("Latn")) { result = extractWords(fileContent, LATN_PATTERN); } else if (input.equals("Cyrl")) { result = extractWords(fileContent, CYRL_PATTERN); diff --git a/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part2.java b/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part2.java index 8dc9817..cecf766 100644 --- a/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part2.java +++ b/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part2.java @@ -14,11 +14,13 @@ public class Part2 { InputStream stdin = System.in; - System.setIn(new ByteArrayInputStream(symin.getBytes(StandardCharsets.UTF_8))); + try { + System.setIn(new ByteArrayInputStream(symin.getBytes(StandardCharsets.UTF_8))); + WordContainer.main(args); + } finally { + System.setIn(stdin); + } - WordContainer.main(args); - - System.setIn(stdin); } } diff --git a/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part3.java b/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part3.java index 5005f23..8099494 100644 --- a/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part3.java +++ b/semester-4/ОПJа/lb-4/task4/src/main/java/ua/nure/jfn/task4/Part3.java @@ -25,6 +25,5 @@ public class Part3 { ResourceBundle bundle = ResourceBundle.getBundle(BASE_NAME, locale); System.out.println(bundle.getString(parts[0])); } - scanner.close(); } }