Skip to content

Commit 459c51e

Browse files
suoapvssuoapvs
committed
Updated a lesson 04.
1 parent a3b8d06 commit 459c51e

File tree

12 files changed

+62
-89
lines changed

12 files changed

+62
-89
lines changed

‎src/main/java/com/yurii/salimov/lesson04/task01/Human.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* @author Yuriy Salimov ([email protected])
55
* @version 1.0
66
*/
7-
public class Human implements Comparable {
7+
public final class Human implements Comparable {
88

9-
private int age;
9+
private final int age;
1010

11-
public Human(int age) {
11+
public Human(final int age) {
1212
this.age = age;
1313
}
1414

‎src/main/java/com/yurii/salimov/lesson04/task01/HumanComparator.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@
66
* @author Yuriy Salimov ([email protected])
77
* @version 1.0
88
*/
9-
public class HumanComparator implements Comparator {
9+
public final class HumanComparator implements Comparator<Human> {
1010

1111
@Override
12-
public int compare(Object obj1, Object obj2) {
13-
final Human human1 = (Human) obj1;
14-
final Human human2 = (Human) obj2;
15-
return human1.getAge() - human2.getAge();
12+
public int compare(final Human first, final Human second) {
13+
return first.getAge() - second.getAge();
1614

17-
/*if (human1.getAge() < human2.getAge()) {
15+
/*if (first.getAge() < second.getAge()) {
1816
return -1;
19-
} else if (human1.getAge() > human2.getAge()) {
17+
} else if (first.getAge() > second.getAge()) {
2018
return 1;
2119
} else {
2220
return 0;

‎src/main/java/com/yurii/salimov/lesson04/task01/Main.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class Main {
1212

1313
public static void main(String[] args) {
14-
Human[] list = {new Human(20), new Human(40), new Human(3), new Human(7)};
14+
final Human[] list = {new Human(20), new Human(40), new Human(3), new Human(7)};
1515

1616
//Arrays.sort(list);
1717
//Arrays.sort(list, new HumanComparator());

‎src/main/java/com/yurii/salimov/lesson04/task02/Circle.java

+6-9
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
* @author Yuriy Salimov ([email protected])
55
* @version 1.0
66
*/
7-
public class Circle extends Figure {
7+
public final class Circle extends Figure {
88

99
private static final String NAME = "Circle";
1010

11-
private double radius;
11+
private final double radius;
1212

13-
public Circle(double radius) {
13+
public Circle(final double radius) {
1414
this.radius = radius;
1515
}
1616

@@ -28,11 +28,8 @@ public double getRadius() {
2828
return this.radius;
2929
}
3030

31-
public void setRadius(double radius) {
32-
this.radius = radius;
33-
}
34-
35-
public static Circle combine(final Circle circle1, final Circle circle2) {
36-
return new Circle(circle1.getRadius() + circle2.getRadius());
31+
public static Circle combine(final Circle first, final Circle second) {
32+
final double radius = first.getRadius() + second.getRadius();
33+
return new Circle(radius);
3734
}
3835
}

‎src/main/java/com/yurii/salimov/lesson04/task02/FigureComparator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
* @author Yuriy Salimov ([email protected])
77
* @version 1.0
88
*/
9-
public class FigureComparator<T extends Figure> implements Comparator<T> {
9+
public final class FigureComparator<T extends Figure> implements Comparator<T> {
1010

1111
@Override
12-
public int compare(T figure1, T figure2) {
12+
public int compare(final T figure1, final T figure2) {
1313
if (figure1 != null && figure2 != null) {
1414
if (figure1.getArea() < figure2.getArea()) {
1515
return -1;

‎src/main/java/com/yurii/salimov/lesson04/task02/FigureList.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @author Yuriy Salimov ([email protected])
55
* @version 1.0
66
*/
7-
public class FigureList {
7+
public final class FigureList {
88

99
private final static int DEFAULT_CAPACITY = 10;
1010

@@ -15,11 +15,15 @@ public FigureList() {
1515
this(DEFAULT_CAPACITY);
1616
}
1717

18-
public FigureList(int capacity) {
19-
this.list = new Figure[capacity];
18+
public FigureList(final int capacity) {
19+
if (capacity > 0) {
20+
this.list = new Figure[capacity];
21+
} else {
22+
this.list = new Figure[DEFAULT_CAPACITY];
23+
}
2024
}
2125

22-
public void add(Figure figure) {
26+
public void add(final Figure figure) {
2327
checkList();
2428
this.list[this.counter++] = figure;
2529
}
@@ -42,7 +46,7 @@ public void sort(final Sorting.Type sortingType) {
4246
new Sorting(this.list, sortingType).sort();
4347
}
4448

45-
public Figure get(int index) {
49+
public Figure get( final int index) {
4650
return this.list[index];
4751
}
4852

@@ -60,7 +64,7 @@ private void checkList() {
6064
}
6165
}
6266

63-
private void resizeList(int newLength) {
67+
private void resizeList( final int newLength) {
6468
final Figure[] list = new Figure[newLength];
6569
final int length = this.list.length < newLength ? this.list.length : newLength;
6670
System.arraycopy(this.list, 0, list, 0, length);

‎src/main/java/com/yurii/salimov/lesson04/task02/Rectangle.java

+8-17
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
* @author Yuriy Salimov ([email protected])
55
* @version 1.0
66
*/
7-
public class Rectangle extends Figure {
7+
public final class Rectangle extends Figure {
88

99
private static final String NAME = "Rectangle";
1010

11-
private double width;
12-
private double height;
11+
private final double width;
12+
private final double height;
1313

14-
public Rectangle(double width, double height) {
14+
public Rectangle(final double width, final double height) {
1515
this.width = width;
1616
this.height = height;
1717
}
@@ -30,22 +30,13 @@ public double getWidth() {
3030
return this.width;
3131
}
3232

33-
public void setWidth(double width) {
34-
this.width = width;
35-
}
36-
3733
public double getHeight() {
3834
return this.height;
3935
}
4036

41-
public void setHeight(double height) {
42-
this.height = height;
43-
}
44-
45-
public static Rectangle combine(final Rectangle rectangle1, final Rectangle rectangle2) {
46-
return new Rectangle(
47-
rectangle1.getHeight() + rectangle2.getHeight(),
48-
rectangle1.getWidth() + rectangle2.getWidth()
49-
);
37+
public static Rectangle combine(final Rectangle first, final Rectangle second) {
38+
final double width = first.getWidth() + second.getWidth();
39+
final double heigth = first.getHeight() + second.getHeight();
40+
return new Rectangle(width, heigth);
5041
}
5142
}

‎src/main/java/com/yurii/salimov/lesson04/task02/Sorting.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
* @author Yuriy Salimov ([email protected])
77
* @version 1.0
88
*/
9-
public class Sorting {
9+
public final class Sorting {
1010

1111
public enum Type {
1212
DEFAULT, BUBBLE, INSERTION, GNOME
1313
}
1414

15-
private Figure[] figures;
15+
private final Figure[] figures;
1616

1717
private Type sortingType;
1818

@@ -51,42 +51,42 @@ private static void systemSort(final Figure[] list) {
5151
}
5252

5353
private static void bubbleSort(final Figure[] list) {
54-
Figure figure;
54+
Figure temp;
5555
for (int i = 0; i < list.length; i++) {
5656
for (int j = i + 1; j < list.length; j++) {
5757
if (list[j].getArea() < list[i].getArea()) {
58-
figure = list[i];
58+
temp = list[i];
5959
list[i] = list[j];
60-
list[j] = figure;
60+
list[j] = temp;
6161
}
6262
}
6363
}
6464
}
6565

6666
private static void insertionSort(final Figure[] list) {
67-
Figure figure;
67+
Figure temp;
6868
int i;
6969
for (int j = 1; j < list.length; j++) {
70-
figure = list[j];
70+
temp = list[j];
7171
i = j - 1;
72-
while (i >= 0 && list[i].getArea() > figure.getArea()) {
72+
while (i >= 0 && list[i].getArea() > temp.getArea()) {
7373
list[i + 1] = list[i];
7474
i--;
7575
}
76-
list[i + 1] = figure;
76+
list[i + 1] = temp;
7777
}
7878
}
7979

8080
private static void gnomeSort(final Figure[] list) {
8181
int j = 0;
82-
Figure figure;
82+
Figure temp;
8383
while (j < list.length) {
8484
if (j == 0 || list[j - 1].getArea() <= list[j].getArea()) {
8585
j++;
8686
} else {
87-
figure = list[j];
87+
temp = list[j];
8888
list[j] = list[j - 1];
89-
list[j - 1] = figure;
89+
list[j - 1] = temp;
9090
j--;
9191
}
9292
}

‎src/main/java/com/yurii/salimov/lesson04/task02/Triangle.java

+10-23
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* @author Yuriy Salimov ([email protected])
55
* @version 1.0
66
*/
7-
public class Triangle extends Figure {
7+
public final class Triangle extends Figure {
88

99
private static final String NAME = "Triangle";
1010

11-
private double sideA;
12-
private double sideB;
13-
private double sideC;
11+
private final double sideA;
12+
private final double sideB;
13+
private final double sideC;
1414

15-
public Triangle(double sideA, double sideB, double sideC) {
15+
public Triangle(final double sideA, final double sideB, final double sideC) {
1616
this.sideA = sideA;
1717
this.sideB = sideB;
1818
this.sideC = sideC;
@@ -39,31 +39,18 @@ public double getSideA() {
3939
return this.sideA;
4040
}
4141

42-
public void setSideA(double sideA) {
43-
this.sideA = sideA;
44-
}
45-
4642
public double getSideB() {
4743
return this.sideB;
4844
}
4945

50-
public void setSideB(double sideB) {
51-
this.sideB = sideB;
52-
}
53-
5446
public double getSideC() {
5547
return this.sideC;
5648
}
5749

58-
public void setSideC(double sideC) {
59-
this.sideC = sideC;
60-
}
61-
62-
public static Triangle combine(Triangle triangle1, Triangle triangle2) {
63-
return new Triangle(
64-
triangle1.getSideA() + triangle2.getSideA(),
65-
triangle1.getSideB() + triangle2.getSideB(),
66-
triangle1.getSideC() + triangle2.getSideC()
67-
);
50+
public static Triangle combine(final Triangle first, final Triangle second) {
51+
final double sideA = first.getSideA() + second.getSideA();
52+
final double sideB = first.getSideB() + second.getSideB();
53+
final double sideC = first.getSideC() + second.getSideC();
54+
return new Triangle(sideA, sideB, sideC);
6855
}
6956
}

‎src/main/java/com/yurii/salimov/lesson04/task03_04_05/FileEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @author Yuriy Salimov ([email protected])
99
* @version 1.0
1010
*/
11-
public class FileEvent implements IFileEvent {
11+
public final class FileEvent implements IFileEvent {
1212

1313
private final static SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
1414

‎src/main/java/com/yurii/salimov/lesson04/task03_04_05/IFileEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
*/
99
public interface IFileEvent {
1010

11-
void onFileAdded(final File file);
11+
void onFileAdded(File file);
1212
}

‎src/main/java/com/yurii/salimov/lesson04/task03_04_05/Monitor.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* @author Yuriy Salimov ([email protected])
88
* @version 1.0
99
*/
10-
public class Monitor {
10+
public final class Monitor {
1111

12-
private String[] name;
13-
private IFileEvent event;
12+
private final String[] name;
13+
private final IFileEvent event;
1414

1515
public Monitor(final String name, final IFileEvent event) {
1616
this(new String[]{name}, event);
@@ -103,10 +103,6 @@ private boolean infoFile(File file, String type) {
103103
return typeFile.equals(type) || type == null;
104104
}
105105

106-
public void setName(String[] name) {
107-
this.name = name;
108-
}
109-
110106
public String[] getName() {
111107
return name;
112108
}

0 commit comments

Comments
 (0)