Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ex1/Task1.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

public class Task1 {
public static void main(String[] args) throws IOException {
File file = new File("C:/Work/test-java.txt");
File file = new File("D:/test-java.txt");
file.createNewFile();

FileOutputStream outputStream = new FileOutputStream(file);
Expand Down
7 changes: 4 additions & 3 deletions src/ex2/Task2.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package ex2;

/**
* Created by Denis on 24.11.2016.
*/
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;

/**
* Created by Denis on 24.11.2016.
*/

public class Task2 {
public static void main(String[] args) throws IOException {
File file = new File("C:/Work/test-java.txt");
Expand Down
2 changes: 1 addition & 1 deletion src/ex2/TextFileReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public String getContentAsString() throws IOException {
allText.append(scanner.nextLine()).append("\n");
}
} catch (FileNotFoundException e) {
System.out.println("File not found");
throw new IllegalStateException("File not found");
}
return String.valueOf(allText);
}
Expand Down
5 changes: 5 additions & 0 deletions src/ex3/Human.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,9 @@ public String getPhoneNumber() {
public String getAddress() {
return address;
}

@Override
public String toString() {
return String.format("Name: %s %s, telephone number: %s, address: %s", firstName, lastName, phoneNumber, address);
}
}
27 changes: 0 additions & 27 deletions src/ex3/HumanInfo.java

This file was deleted.

24 changes: 10 additions & 14 deletions src/ex3/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,21 @@ public class Main {
public static void main(String[] args) {
Human human = new Human();

human.setFirstName(getStringFromUser(
String.format("%-14s", "First name:")));
human.setLastName(getStringFromUser(
String.format("%-14s", "Last name:")));
human.setPhoneNumber(getStringFromUser(
String.format("%-14s", "Phone number:")));
human.setAddress(getStringFromUser(
String.format("%-14s", "Address:")));
System.out.print(String.format("%-14s", "First name:"));
human.setFirstName(getStringFromUser());
System.out.print(String.format("%-14s", "Last name:"));
human.setLastName(getStringFromUser());
System.out.print(String.format("%-14s", "Phone number:"));
human.setPhoneNumber(getStringFromUser());
System.out.print(String.format("%-14s", "Address:"));
human.setAddress(getStringFromUser());

System.out.println();
HumanInfo info = new HumanInfo(human);
info.printName();
info.printPhone();
info.printAddress();
System.out.println(human);
}

private static String getStringFromUser(String prompt) {
private static String getStringFromUser() {
while (true) {
System.out.print(prompt);
try {
Scanner in = new Scanner(System.in);
return in.nextLine();
Expand Down