Skip to content
This repository was archived by the owner on Oct 25, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
fc198c5
Task 1 and project
dvaschenko Jul 6, 2021
766bfbe
Correct solution
dvaschenko Jul 12, 2021
53d43e9
Create README.md
dvaschenko Jul 12, 2021
a2d59f3
Update README.md
dvaschenko Jul 12, 2021
5413036
Red added, System.exit removed.
dvaschenko Jul 13, 2021
0a4894d
Merge remote-tracking branch 'origin/feature/DmitriyVaschenko' into f…
dvaschenko Jul 13, 2021
7a1e360
HW 2.1 first attempt
dvaschenko Jul 14, 2021
1f1bf78
Some package and readme changes
dvaschenko Jul 14, 2021
2a866b0
HW 2 task 2
dvaschenko Jul 14, 2021
21cb740
Merge branch 'master' into feature/DmitriyVaschenko
ArtemNikolaev1 Jul 15, 2021
460d1ef
HW 2 done tasks and HW 1 fixed.
dvaschenko Jul 18, 2021
d94f469
Merge remote-tracking branch 'origin/feature/DmitriyVaschenko' into f…
dvaschenko Jul 18, 2021
dec261f
fixed output
dvaschenko Jul 18, 2021
96bf408
Merge remote-tracking branch 'origin/master' into feature/DmitriyVasc…
dvaschenko Jul 23, 2021
c084454
Added some tests, HW 2 done
dvaschenko Jul 25, 2021
2f7c00c
PyramidPrinter with tests are done.
dvaschenko Aug 2, 2021
41db64e
RandomCharsTable with tests are done.
dvaschenko Aug 2, 2021
d17bf09
HW 2 plus tests are done.
dvaschenko Aug 3, 2021
9267035
ImmutableClassExample added.
dvaschenko Aug 3, 2021
390246f
Readme fixed with correct links.
dvaschenko Aug 3, 2021
147c3bc
Small fixes
dvaschenko Aug 7, 2021
b1cc640
CustomFileReader added
dvaschenko Aug 16, 2021
cf568ea
Singleton added
dvaschenko Aug 16, 2021
f25e851
Tests added
dvaschenko Aug 19, 2021
5518ae7
Tests added
dvaschenko Aug 19, 2021
5388971
README fixes
dvaschenko Aug 19, 2021
c569b23
PowerOfNumber with tests
dvaschenko Aug 23, 2021
d1783ff
CustomRegexMatcher with tests
dvaschenko Aug 23, 2021
eae2a8a
README revisions
dvaschenko Aug 23, 2021
04089a0
small fixes
dvaschenko Sep 5, 2021
3e9e559
Project is in process
dvaschenko Sep 23, 2021
7009de9
nano fix
dvaschenko Sep 23, 2021
651039a
90 % done, wo tests
dvaschenko Sep 25, 2021
9f8e8d9
Functional is done, tests to do
dvaschenko Sep 26, 2021
0bb6477
HW 3 revisited ,6,7 added
dvaschenko Sep 26, 2021
ceef6d1
Some tests added
dvaschenko Sep 26, 2021
5d7c2c7
Some more tests added
dvaschenko Sep 26, 2021
edf0cc0
Workable main
dvaschenko Sep 26, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
# Java Core June 2021

## *Nikolaev Artem*
## *Vaschenko Dmitriy*

| Number | Solution | Short description
| --- | --- | --- |
| HW1 | [Console printer](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/master/src/main/java/homework_1) | The app that reads input arguments and prints them, until "error" argument |
| Course project|[Sea battle](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/course_project)| Sea battle realisation, fight VS computer
| HW 1 | [Console printer](https://github.com/NikolaevArtem/Java_Core_June_2021/blob/feature/DmitriyVaschenko/src/main/java/homework_1/ConsolePrinter.java) | The app that reads input arguments and prints them, until "error" argument |
| HW 2_1 | [Traffic Light](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/homework_2/traffic_light) | Traffic Light app, the simple one. |
| HW 2_2 | [Pyramid printer](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/homework_2/pyramid_printer) | The Pyramid printer, prints triangles only, btw. |
| HW 2_3| [RandomCharsTable](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/homework_2/random_chars_table) | Random chars table, prints table with chars and then sorts them by even or odd.
| HW 3, Immutable Class Example| [ImutableClassExample](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/homework_3) | Immutable class.
| HW 4_1| [CustomAnnotation](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/homework_4/custom_annotation)| Annotation for JSON Serialization
| HW 4_2| [CustomFileReader](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/homework_4/custom_file_reader) | File Reader which removes all full stops and comas from TXT file
| HW 4_3| [Singleton](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/homework_4/singleton)| Three singleton classes
| HW 5_1| [CustomRegexMatcher](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/homework_5/custom_regex_matcher)| App is checking if input matches moderate password
| HW 5_2| [PowerOfNumber](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/homework_5/power_of_number)|Recursively counts given degree of a given number
| HW 6 |[Map problems](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/homework_6)| Map collision generation and Map with mutable key
| HW 7 |[Kitten to Cat function](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/main/java/homework_7)| Functional interface to map kittens into cats
| Tests|[Tests](https://github.com/NikolaevArtem/Java_Core_June_2021/tree/feature/DmitriyVaschenko/src/test/java/homework) | Tests for homework

[Link to markdown giude](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet)
[Link to CodingBat](https://codingbat.com/done?user=dvaschenko33@gmail.com&tag=4651459890)

[Link to markdown guide](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet)
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ repositories {
}

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.0'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion gradlew
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

178 changes: 89 additions & 89 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
rootProject.name = 'Java Core June 2021'
include 'test'

11 changes: 11 additions & 0 deletions src/main/java/ConsoleColors/ConsoleColors.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package ConsoleColors;

public final class ConsoleColors{

public static final String RESET = "\033[0m";
public static final String RED = "\033[0;31m";
public static final String GREEN = "\033[0;32m";
public static final String YELLOW = "\033[0;33m";

}

12 changes: 12 additions & 0 deletions src/main/java/course_project/Main.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package course_project;

import course_project.Utils.ConsoleHandling.Printer;
import course_project.components.Field;

public class Main {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
The computer shot it shown only on the next computer turn

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opt: cells around a destroyed ship could be marked as miss automatically
image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well-done! The game is confortable to play, has nice interface, automatic ship placement, informative messages. The visual representation is also good.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the code perspective also looks good, there are minor issues but in general, the code is readable, easy to follow, has nice abstractions. You show good knowledge of Java Core and Java libraries. Approved!

public static void main(String[] args) {

new SeaBattle().play();

}
}
Loading