Skip to content

Commit 95fb937

Browse files
committed
Fix some bugs
1 parent 0b7a2e5 commit 95fb937

File tree

8 files changed

+33
-24
lines changed

8 files changed

+33
-24
lines changed

.gitignore

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.gradle
2+
**/build/
3+
!src/**/build/
4+
5+
gradle-app.setting
6+
7+
!gradle-wrapper.jar
8+
9+
!gradle-wrapper.properties
10+
11+
.gradletasknamecache
12+
13+
.project
14+
15+
.classpath
16+
17+
.idea
18+
19+
javadoc

src/main/java/IOutils/readers/CoordinatesReader.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package IOutils.readers;
22

3-
import IOutils.InputAndOutput;
3+
import client.InputAndOutput;
44
import collection.Coordinates;
55
import lombok.RequiredArgsConstructor;
66

7-
import java.util.Scanner;
8-
97
@RequiredArgsConstructor
108
public class CoordinatesReader {
119
private final InputAndOutput inputAndOutput;

src/main/java/IOutils/readers/LocationReader.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package IOutils.readers;
22

3-
import IOutils.InputAndOutput;
3+
import client.InputAndOutput;
44
import lombok.RequiredArgsConstructor;
55
import collection.Location;
66

7-
import java.util.Scanner;
8-
97
@RequiredArgsConstructor
108
public class LocationReader {
119
private final InputAndOutput inputAndOutput;

src/main/java/IOutils/readers/ObjectReader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package IOutils.readers;
22

3-
import IOutils.InputAndOutput;
3+
import client.InputAndOutput;
44
import collection.*;
55
import collection.collectionUtil.MusicBandBuilder;
66

src/main/java/IOutils/readers/PersonReader.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package IOutils.readers;
22

3-
import IOutils.InputAndOutput;
4-
import IOutils.readers.LocationReader;
3+
import client.InputAndOutput;
54
import collection.*;
65

7-
import java.util.Scanner;
8-
96
public class PersonReader {
107
InputAndOutput inputAndOutput;
118
private LocationReader locationReader;

src/main/java/Application.java renamed to src/main/java/client/ClientApp.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1+
package client;
2+
13
import IOutils.UserInputManager;
24
import collection.collectionUtil.CollectionManager;
35
import commands.commandsUtils.CommandsManager;
46

5-
import java.io.File;
6-
import java.io.IOException;
7+
import java.io.*;
8+
import java.net.Socket;
79
import java.text.ParseException;
810
import java.util.Map;
911
import java.util.NoSuchElementException;
1012
import java.util.Scanner;
1113
import java.util.regex.Matcher;
1214
import java.util.regex.Pattern;
1315

14-
public class Application {
16+
public class ClientApp {
1517
public static void main(String[] arg) {
18+
1619
Scanner scanner = new Scanner(System.in);
1720
CommandsManager commandsManager = new CommandsManager();
1821
CollectionManager collectionManager = new CollectionManager();
@@ -22,7 +25,7 @@ public static void main(String[] arg) {
2225
System.out.println("Please, save the file name in environment variable FILE_NAME");
2326
System.exit(-1);
2427
}
25-
Pattern pattern = Pattern.compile("/*/dev/*");
28+
Pattern pattern = Pattern.compile("/*/dev/*");
2629
File file = new File(fileName);
2730
Matcher matcher = pattern.matcher(file.getAbsolutePath());
2831
if (matcher.find()) {

src/main/java/IOutils/InputAndOutput.java renamed to src/main/java/client/InputAndOutput.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package IOutils;
1+
package client;
22

33
import lombok.Getter;
44
import lombok.RequiredArgsConstructor;

src/main/java/collection/MusicBand.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,8 @@ public String toString() {
4646
*/
4747
public String getStringToSaveInFile() {
4848

49-
/*return id + "," + name + "," + coordinates.getX() + "," + coordinates.getY() + "," + getStringDate()
50-
+ "," + numberOfParticipants + "," + albumsCount + "," + description + "," + genre
51-
+ "," + frontMan.getName() + "," + height + "," + eyeColor
52-
+ "," + frontMan.getHairColor() + "," + frontMan.getNationality()
53-
+ "," + frontMan.getLocation().getX() + "," + frontMan.getLocation().getY() + ","
54-
+ frontMan.getLocation().getZ();*/
55-
return String.format("%s,%s,%s,%s,%s,%s,%s,%s,%s", id,name,coordinates.getStringToSaveInFile(),getStringDate(), numberOfParticipants,
56-
albumsCount,description,genre,frontMan.getStringToSaveInFile());
49+
return String.format("%s,%s,%s,%s,%s,%s,%s,%s,%s", id, name, coordinates.getStringToSaveInFile(), getStringDate(), numberOfParticipants,
50+
albumsCount, description, genre, frontMan.getStringToSaveInFile());
5751
}
5852

5953
/**

0 commit comments

Comments
 (0)