Skip to content
This repository was archived by the owner on Dec 28, 2024. It is now read-only.

Commit ea5a113

Browse files
Kostya507Kostya507
committed
Merge remote-tracking branch 'origin/main'
2 parents 4d6c4d7 + 2a3e5dd commit ea5a113

File tree

2,260 files changed

+60147
-256
lines changed

Some content is hidden

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

2,260 files changed

+60147
-256
lines changed

‎.egitorconfig renamed to ‎.editorconfig

File renamed without changes.

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎README.adoc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,14 @@ image:docs/calendar.png[]
2626
ноябрь [13дек] [21-32 v]
2727
декабрь [---------] [зачет v] :: list
2828
----
29+
30+
[source,scratch-v3.0]
31+
----
32+
абстракция [12окт] [14:40 v] :: looks
33+
наследование [14окт] [20:00 v] :: motion
34+
инкапсуляция [19окт] [14:40 v]
35+
полиморфизм [21окт] [20:00 v] :: list
36+
SOLID/KISS [26окт] [14:40 v] :: looks
37+
Радикальный ООП [28окт] [20:00 v] :: motion
38+
Object [2ноя] [14:40 v]
39+
----

‎SECURITY.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
Use this section to tell people about which versions of your project are
6+
currently being supported with security updates.
7+
8+
| Version | Supported |
9+
| ------- | ------------------ |
10+
| < 4.0 | :x: |
11+
12+
## Reporting a Vulnerability
13+
14+
Use this section to tell people how to report a vulnerability.
15+
16+
Tell them where to go, how often they can expect to get an update on a
17+
reported vulnerability, what to expect if the vulnerability is accepted or
18+
declined, etc.

‎pom.xml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>ru.mirea.practice</groupId>
@@ -13,8 +13,8 @@
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<maven.compiler.source>11</maven.compiler.source>
1515
<maven.compiler.target>11</maven.compiler.target>
16-
<version.junit>1.11.1</version.junit>
17-
<version.jupiter>5.11.1</version.jupiter>
16+
<version.junit>1.11.3</version.junit>
17+
<version.jupiter>5.11.3</version.jupiter>
1818
<version.pmd>6.52.0</version.pmd>
1919
</properties>
2020

@@ -27,6 +27,8 @@
2727
</scm>
2828

2929
<modules>
30+
<module>students/23K0135</module>
31+
<module>students/23K0623</module>
3032
<module>students/0000001</module>
3133
<module>students/23K0093</module>
3234
<module>students/23K0690</module>
@@ -44,6 +46,7 @@
4446
<module>students/23K0364</module>
4547
<module>students/23K0155</module>
4648
<module>students/23K0114</module>
49+
<module>students/23K0815</module>
4750
<module>students/23K0341</module>
4851
<module>students/23K0823</module>
4952
<module>students/23K0087</module>
@@ -54,11 +57,9 @@
5457
<module>students/23K0116</module>
5558
<module>students/23K0339</module>
5659
<module>students/23K0691</module>
57-
<module>students/23K0815</module>
5860
<module>students/23K0089</module>
5961
<module>students/23K0375</module>
6062
<module>students/23K0340</module>
61-
<module>students/23K0342</module>
6263
<module>students/23K0354</module>
6364
<module>students/23K0689</module>
6465
<module>students/23F0011</module>
@@ -71,7 +72,15 @@
7172
<module>students/23K0505</module>
7273
<module>students/23K0359</module>
7374
<module>students/23K0688</module>
75+
<module>students/23K0355</module>
76+
<module>students/23K0215</module>
77+
<module>students/23K1167</module>
78+
<module>students/23K1226</module>
79+
<module>students/23K9901</module>
7480
<module>students/23K0145</module>
81+
<module>students/23K0186</module>
82+
<module>students/23K0755</module>
83+
7584
</modules>
7685
<dependencies>
7786
<dependency>
@@ -133,12 +142,12 @@
133142
<plugin>
134143
<groupId>org.apache.maven.plugins</groupId>
135144
<artifactId>maven-checkstyle-plugin</artifactId>
136-
<version>3.5.0</version>
145+
<version>3.6.0</version>
137146
<dependencies>
138147
<dependency>
139148
<groupId>com.puppycrawl.tools</groupId>
140149
<artifactId>checkstyle</artifactId>
141-
<version>10.18.2</version>
150+
<version>10.19.0</version>
142151
</dependency>
143152
</dependencies>
144153
<configuration>
@@ -208,4 +217,4 @@
208217
</plugin>
209218
</plugins>
210219
</build>
211-
</project>
220+
</project>

‎students/23F0011/23F0011-p06/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<artifactId>23F0011</artifactId>
7+
<groupId>ru.mirea.practice</groupId>
8+
<version>2024.1</version>
9+
<relativePath>../pom.xml</relativePath>
10+
</parent>
11+
<artifactId>23F0011-p06</artifactId>
12+
<description>Массивы</description>
13+
</project>

‎students/23F0011/23F0011-p06/src/main/java/ru/mirea/practice/s23f0011/task1/Movable.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package ru.mirea.practice.s23f0011.task1;
2+
3+
public interface Movable {
4+
void moveUp();
5+
6+
void moveDown();
7+
8+
void moveLeft();
9+
10+
void moveRight();
11+
}

‎students/23F0011/23F0011-p06/src/main/java/ru/mirea/practice/s23f0011/task1/MovableCircle.java

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package ru.mirea.practice.s23f0011.task1;
2+
3+
public class MovableCircle {
4+
private final int radius;
5+
private final MovablePoint center;
6+
7+
MovableCircle(MovablePoint center, int radius) {
8+
this.radius = radius;
9+
this.center = center;
10+
}
11+
12+
public void moveUp() {
13+
center.moveUp();
14+
}
15+
16+
public void moveDown() {
17+
center.moveDown();
18+
}
19+
20+
public void moveLeft() {
21+
center.moveLeft();
22+
}
23+
24+
public void moveRight() {
25+
center.moveRight();
26+
}
27+
28+
@Override
29+
public String toString() {
30+
return "MovableCircle{" + "radius=" + radius + ", center=" + center + '}';
31+
}
32+
}

‎students/23F0011/23F0011-p06/src/main/java/ru/mirea/practice/s23f0011/task1/MovablePoint.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package ru.mirea.practice.s23f0011.task1;
2+
3+
public class MovablePoint {
4+
private int x;
5+
private int y;
6+
private final int xspeed;
7+
private final int yspeed;
8+
9+
MovablePoint(int x, int y, int xspeed, int yspeed) {
10+
this.x = x;
11+
this.y = y;
12+
this.xspeed = xspeed;
13+
this.yspeed = yspeed;
14+
}
15+
16+
public void moveUp() {
17+
this.y += yspeed;
18+
}
19+
20+
public void moveDown() {
21+
this.y -= yspeed;
22+
}
23+
24+
public void moveLeft() {
25+
this.x -= xspeed;
26+
}
27+
28+
public void moveRight() {
29+
this.x += xspeed;
30+
}
31+
32+
@Override
33+
public String toString() {
34+
return "MovablePoint{" + "x=" + x + ", y=" + y + ", xSpeed=" + xspeed + ", ySpeed=" + yspeed + '}';
35+
}
36+
}

0 commit comments

Comments
 (0)