Skip to content

Commit 46af4ac

Browse files
NF-coderNF-coder
committed
..
1 parent 346b55a commit 46af4ac

File tree

1,099 files changed

+363
-101928
lines changed

Some content is hidden

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

1,099 files changed

+363
-101928
lines changed

‎programming/sem2/lab5_v2/client/pom.xml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<artifactId>lab5_v2</artifactId>
9+
<groupId>1</groupId>
10+
<version>1.0</version>
11+
</parent>
12+
13+
<artifactId>client</artifactId>
14+
<version>1.0</version>
15+
16+
<build>
17+
<sourceDirectory>src</sourceDirectory>
18+
<resources>
19+
<resource>
20+
<directory>resources</directory>
21+
</resource>
22+
</resources>
23+
<plugins>
24+
<plugin>
25+
<groupId>org.apache.maven.plugins</groupId>
26+
<artifactId>maven-jar-plugin</artifactId>
27+
<version>3.4.2</version>
28+
<configuration>
29+
<archive>
30+
<manifest>
31+
<mainClass>Main</mainClass>
32+
</manifest>
33+
</archive>
34+
</configuration>
35+
</plugin>
36+
<plugin>
37+
<groupId>org.apache.maven.plugins</groupId>
38+
<artifactId>maven-shade-plugin</artifactId>
39+
<version>3.6.0</version>
40+
<executions>
41+
<execution>
42+
<phase>package</phase>
43+
<goals>
44+
<goal>shade</goal>
45+
</goals>
46+
<configuration>
47+
<artifactSet>
48+
<includes>
49+
<include>1:shared</include>
50+
<include>org.apache.logging.log4j:*</include>
51+
</includes>
52+
</artifactSet>
53+
</configuration>
54+
</execution>
55+
</executions>
56+
</plugin>
57+
58+
</plugins>
59+
</build>
60+
61+
<properties>
62+
<maven.compiler.source>17</maven.compiler.source>
63+
<maven.compiler.target>17</maven.compiler.target>
64+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
65+
</properties>
66+
67+
<dependencies>
68+
<dependency>
69+
<groupId>org.apache.logging.log4j</groupId>
70+
<artifactId>log4j-api</artifactId>
71+
<version>2.17.1</version>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.apache.logging.log4j</groupId>
75+
<artifactId>log4j-core</artifactId>
76+
<version>2.17.1</version>
77+
</dependency>
78+
79+
<dependency>
80+
<groupId>1</groupId>
81+
<artifactId>shared</artifactId>
82+
<version>1.0</version>
83+
<scope>compile</scope>
84+
</dependency>
85+
</dependencies>
86+
87+
</project>

programming/sem2/lab5_v2/src/main/java/client/Main.java renamed to programming/sem2/lab5_v2/client/src/Main.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package client;
2-
3-
import client.core.Engine;
1+
import core.Engine;
42

53
public class Main {
64
public static void main(String[] args) {

programming/sem2/lab5_v2/src/main/java/client/commands/BasicCommand.java renamed to programming/sem2/lab5_v2/client/src/commands/BasicCommand.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
package client.commands;
1+
package commands;
22

3-
import client.core.Engine;
4-
import client.network.NetworkManager;
5-
import shared.objects.NetworkResponseDTO;
3+
import core.Engine;
64

75
import java.util.HashMap;
86
import java.util.function.Consumer;

programming/sem2/lab5_v2/src/main/java/client/commands/exceptions/ElementNotFound.java renamed to programming/sem2/lab5_v2/client/src/commands/exceptions/ElementNotFound.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package client.commands.exceptions;
1+
package commands.exceptions;
22

33
public class ElementNotFound extends Exception {
44
public ElementNotFound(String message) {

programming/sem2/lab5_v2/src/main/java/client/commands/exceptions/FileProcessorException.java renamed to programming/sem2/lab5_v2/client/src/commands/exceptions/FileProcessorException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package client.commands.exceptions;
1+
package commands.exceptions;
22

33
public class FileProcessorException extends Exception {
44
public FileProcessorException(String message) {

programming/sem2/lab5_v2/src/main/java/client/commands/exceptions/UnacceptableValue.java renamed to programming/sem2/lab5_v2/client/src/commands/exceptions/UnacceptableValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package client.commands.exceptions;
1+
package commands.exceptions;
22

33
public class UnacceptableValue extends Exception {
44
public UnacceptableValue(String message) {

programming/sem2/lab5_v2/src/main/java/client/commands/implementations/Add.java renamed to programming/sem2/lab5_v2/client/src/commands/implementations/Add.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
package client.commands.implementations;
1+
package commands.implementations;
22

33
import java.util.HashMap;
44
import java.util.function.Consumer;
55

6-
import client.commands.exceptions.UnacceptableValue;
7-
import client.commands.objects.validators.CityValidators;
8-
import client.commands.implementations.parsers.AdditionalParsers;
9-
import client.commands.implementations.parsers.EnumsParser;
10-
import client.commands.objects.enums.Climate;
11-
import client.commands.objects.enums.Government;
12-
import client.commands.objects.enums.StandardOfLiving;
13-
import client.commands.BasicCommand;
14-
import client.core.Engine;
15-
import client.network.NetworkManager;
6+
import commands.exceptions.UnacceptableValue;
7+
import commands.objects.validators.CityValidators;
8+
import commands.implementations.parsers.AdditionalParsers;
9+
import commands.implementations.parsers.EnumsParser;
10+
import commands.objects.enums.Climate;
11+
import commands.objects.enums.Government;
12+
import commands.objects.enums.StandardOfLiving;
13+
import commands.BasicCommand;
14+
import core.Engine;
1615
import shared.objects.NetworkRequestDTO;
17-
import shared.objects.NetworkResponseDTO;
1816

1917
public class Add extends BasicCommand {
2018
public Add(Consumer<HashMap<String,String>> outHandler) {

programming/sem2/lab5_v2/src/main/java/client/commands/implementations/AddIfMax.java renamed to programming/sem2/lab5_v2/client/src/commands/implementations/AddIfMax.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
package client.commands.implementations;
1+
package commands.implementations;
22

3-
import client.commands.BasicCommand;
4-
import client.commands.exceptions.UnacceptableValue;
5-
import client.commands.implementations.parsers.AdditionalParsers;
6-
import client.commands.implementations.parsers.EnumsParser;
7-
import client.commands.objects.enums.Climate;
8-
import client.commands.objects.enums.Government;
9-
import client.commands.objects.enums.StandardOfLiving;
10-
import client.commands.objects.validators.CityValidators;
11-
import client.core.Engine;
3+
import commands.BasicCommand;
4+
import commands.implementations.parsers.AdditionalParsers;
5+
import commands.implementations.parsers.EnumsParser;
6+
import commands.objects.enums.Climate;
7+
import commands.objects.enums.Government;
8+
import commands.objects.enums.StandardOfLiving;
9+
import commands.objects.validators.CityValidators;
10+
import core.Engine;
1211
import shared.objects.NetworkRequestDTO;
1312

1413
import java.util.HashMap;

programming/sem2/lab5_v2/src/main/java/client/commands/implementations/AvgOfMetersAboveSea.java renamed to programming/sem2/lab5_v2/client/src/commands/implementations/AvgOfMetersAboveSea.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
package client.commands.implementations;
1+
package commands.implementations;
22

3-
import client.commands.BasicCommand;
4-
import client.commands.exceptions.FileProcessorException;
5-
import client.core.Engine;
6-
import client.textWorkers.Invokers.FileInvoker;
3+
import commands.BasicCommand;
4+
import core.Engine;
75
import shared.objects.NetworkRequestDTO;
86

97
import java.util.HashMap;

programming/sem2/lab5_v2/src/main/java/client/commands/implementations/Clear.java renamed to programming/sem2/lab5_v2/client/src/commands/implementations/Clear.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
package client.commands.implementations;
1+
package commands.implementations;
22

3-
import client.commands.BasicCommand;
4-
import client.core.Engine;
5-
import client.network.NetworkManager;
3+
import commands.BasicCommand;
4+
import core.Engine;
65
import shared.objects.NetworkRequestDTO;
7-
import shared.objects.NetworkResponseDTO;
6+
87
import java.util.HashMap;
98
import java.util.function.Consumer;
109

0 commit comments

Comments
 (0)