Skip to content

Commit ce4d245

Browse files
author
frenchman
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # pom.xml
2 parents beda9cf + 1ea8f8f commit ce4d245

42 files changed

Lines changed: 316 additions & 154 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Calculator/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

@@ -14,6 +15,5 @@
1415
<packaging>jar</packaging>
1516

1617
<name>Calculator</name>
17-
<url>http://maven.apache.org</url>
1818

1919
</project>

‎CalculatorPatternState/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
<version>1.0</version>
1616

1717
<name>CalculatorPatternState</name>
18-
<url>http://maven.apache.org</url>
1918

2019
</project>

‎CalculatorPatternState/src/main/java/Program.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ public static void main(String[] args) throws IOException {
99
while (true) {
1010
char key = (char) System.in.read();
1111

12-
if (key >= ' ') { //чтобы клавиша enter пропустить
13-
12+
if (key >= ' ') { //чтобы клавишу enter пропустить
1413
calc.press(key);
1514
System.out.println(calc);
1615
}

‎CalculatorPatternState/src/main/java/ru/frenchman/calculator/Context.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public void press(char key) {
4343
}
4444
}
4545

46-
4746
public int run(String keys) { //"C2+3="
4847
for (char key : keys.toCharArray()) {
4948
press(key);

‎Exercises/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@
1212
<groupId>ru.frenchman.exercises</groupId>
1313
<artifactId>Exercises</artifactId>
1414
<version>1.0</version>
15-
16-
15+
1716
</project>

‎Exercises/src/main/java/ru/frechman/exercises/algo/chapter_1/TaskCheckBrackets.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ public static void main(String[] args) {
1212
System.out.println(checkBrackets(str));
1313
}
1414

15-
1615
static String checkBrackets(String str) {
1716
Stack<Character> stack = new Stack<>();
1817
Stack<Integer> num = new Stack<>();
@@ -36,7 +35,6 @@ static String checkBrackets(String str) {
3635
|| (top == '{' && arraySrt[i] != '}')) {
3736
return String.valueOf(i + 1);
3837
}
39-
4038
}
4139
return stack.empty() ? SUCCESS : String.valueOf(num.pop() + 1);
4240
}

‎Exercises/src/main/java/ru/frechman/exercises/algo/chapter_1/TaskHeightTree.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public static void main(String[] args) {
1212
for (int i = 0; i < length; i++) {
1313
arr[i] = sc.nextInt();
1414
}
15-
15+
// TODO:
1616
System.out.println(length);
1717
System.out.println(Arrays.toString(arr));
1818
}

‎Exercises/src/main/java/ru/frechman/exercises/calendar/CalendarTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ public static void main(String[] args) {
1616
// 1 - понедельник ... 7 - воскресенье
1717
int value = weekday.getValue();
1818
System.out.println("Mon Tue Wed Thu Fri Sat Sun");
19+
1920
for (int i = 1; i < value; i++) {
2021
System.out.print(" ");
2122
}
23+
2224
while (date.getMonthValue() == month) {
2325
System.out.printf("%3d", date.getDayOfMonth());
2426
if (date.getDayOfMonth() == today) {

‎Exercises/src/main/java/ru/frechman/exercises/hexlet/generics/Main.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public static void main(String[] args) {
1313
);
1414
}
1515

16-
1716
public <T extends Human & ISinger> void sing(T pevec) {
1817
System.out.printf("%s Sing for you: ", pevec.getName());
1918
pevec.sing();

‎Exercises/src/main/java/ru/frechman/exercises/hexlet/generics/ManSinger.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ru.frechman.exercises.hexlet.generics;
22

33
public class ManSinger extends Human implements ISinger {
4+
45
public ManSinger(String name) {
56
super(name);
67
}

0 commit comments

Comments
 (0)