Skip to content

Commit e473fc5

Browse files
authored
Merge pull request #2400
newMain
2 parents c5a985b + 1828ec5 commit e473fc5

File tree

210 files changed

+209
-245
lines changed

Some content is hidden

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

210 files changed

+209
-245
lines changed

3.JavaMultithreading/src/com/javarush/task/jdk13/task41/task4101/Hammer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ public boolean hit(Nail nail) {
77
}
88
return nail.visiblePart == 0;
99
}
10-
}
10+
}

3.JavaMultithreading/src/com/javarush/task/jdk13/task41/task4101/HardWorker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ public void hammerAllNails() {
2222
}
2323
System.out.println(name + " done!");
2424
}
25-
}
25+
}

3.JavaMultithreading/src/com/javarush/task/jdk13/task41/task4101/Microscope.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ public void enlarge(Object o) {
88

99
public void bang() {
1010
}
11-
}
11+
}

3.JavaMultithreading/src/com/javarush/task/jdk13/task41/task4101/MicroscopeAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ public boolean hit(Nail nail) {
1313
microscope.bang();
1414
return false;
1515
}
16-
}
16+
}

3.JavaMultithreading/src/com/javarush/task/jdk13/task41/task4101/Nail.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
public class Nail {
44
public int visiblePart = 40;
5-
}
5+
}

3.JavaMultithreading/src/com/javarush/task/jdk13/task41/task4101/Solution.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ public static Set<Nail> getNailsPack() {
2424
}
2525
return nailPack;
2626
}
27-
}
27+
}

3.JavaMultithreading/src/com/javarush/task/jdk13/task41/task4101/Условие.md

Lines changed: 1 addition & 2 deletions

3.JavaMultithreading/src/com/javarush/task/jdk13/task41/task4102/Pizza.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ public interface Pizza {
55
double getCost();
66

77
String getIngredients();
8-
}
8+
}

3.JavaMultithreading/src/com/javarush/task/jdk13/task41/task4102/PizzaDecorator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ public double getCost() {
1717
public String getIngredients() {
1818
return decoratedPizza.getIngredients();
1919
}
20-
}
20+
}

3.JavaMultithreading/src/com/javarush/task/jdk13/task41/task4102/SimplePizza.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ public double getCost() {
1010
public String getIngredients() {
1111
return "тесто, помидоры, сыр";
1212
}
13-
}
13+
}

0 commit comments

Comments
 (0)