Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 9ef24b9

Browse filesBrowse files
ageleyageley
authored
Hotfix/lesson02 (#2)
+ ArrayStorage - variables renamed for readability, removed unnecessary "this" keywords - storage amount is 10000 - method clear - set to null only filled part of the storage - method getResumeIndex is private; removed check for null input, will be added in model class - method get - return null if uuid is not found + MainArray - variables renamed for readability - "update" method added + MainTestArrayStorage - variables renamed for readability
1 parent f82f0f8 commit 9ef24b9
Copy full SHA for 9ef24b9

File tree

Expand file treeCollapse file tree

3 files changed

+52
-50
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

3 files changed

+52
-50
lines changed
Open diff view settings
Collapse file

‎src/ru/topjava/webapp/MainArray.java‎

Copy file name to clipboardExpand all lines: src/ru/topjava/webapp/MainArray.java
+14-8Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ public class MainArray {
1616

1717
public static void main(String[] args) throws IOException {
1818
BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
19-
Resume r;
19+
Resume resume;
2020
while (true) {
21-
System.out.print("Введите одну из команд - (list | save uuid | delete uuid | get uuid | clear | exit): ");
21+
System.out.print("Введите одну из команд - (list | save uuid | update uuid | delete uuid | get uuid | clear | exit): ");
2222
String[] params = reader.readLine().trim().toLowerCase().split(" ");
2323
if (params.length < 1 || params.length > 2) {
2424
System.out.println("Неверная команда.");
@@ -36,9 +36,15 @@ public static void main(String[] args) throws IOException {
3636
System.out.println(ARRAY_STORAGE.size());
3737
break;
3838
case "save":
39-
r = new Resume();
40-
r.setUuid(uuid);
41-
ARRAY_STORAGE.save(r);
39+
resume = new Resume();
40+
resume.setUuid(uuid);
41+
ARRAY_STORAGE.save(resume);
42+
printAll();
43+
break;
44+
case "update":
45+
resume = new Resume();
46+
resume.setUuid(uuid);
47+
ARRAY_STORAGE.update(resume);
4248
printAll();
4349
break;
4450
case "delete":
@@ -67,10 +73,10 @@ static void printAll() {
6773
if (all.length == 0) {
6874
System.out.println("Empty");
6975
} else {
70-
for (Resume r : all) {
71-
System.out.println(r);
76+
for (Resume resume : all) {
77+
System.out.println(resume);
7278
}
7379
}
7480
System.out.println("----------------------------");
7581
}
76-
}
82+
}
Collapse file

‎src/ru/topjava/webapp/MainTestArrayStorage.java‎

Copy file name to clipboardExpand all lines: src/ru/topjava/webapp/MainTestArrayStorage.java
+21-21Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,33 @@ public class MainTestArrayStorage {
1010
static final ArrayStorage ARRAY_STORAGE = new ArrayStorage();
1111

1212
public static void main(String[] args) {
13-
Resume r1 = new Resume();
14-
r1.setUuid("uuid1");
15-
Resume r2 = new Resume();
16-
r2.setUuid("uuid2");
17-
Resume r3 = new Resume();
18-
r3.setUuid("uuid3");
19-
Resume r3Update = new Resume();
20-
r3Update.setUuid("uuid3");
21-
Resume r4 = new Resume();
22-
r4.setUuid("uuid4");
23-
24-
ARRAY_STORAGE.save(r1);
25-
ARRAY_STORAGE.save(r2);
26-
ARRAY_STORAGE.save(r3);
27-
28-
System.out.println("Get r1: " + ARRAY_STORAGE.get(r1.getUuid()));
13+
Resume resume1 = new Resume();
14+
resume1.setUuid("uuid1");
15+
Resume resume2 = new Resume();
16+
resume2.setUuid("uuid2");
17+
Resume resume3 = new Resume();
18+
resume3.setUuid("uuid3");
19+
Resume resume3Update = new Resume();
20+
resume3Update.setUuid("uuid3");
21+
Resume resume4 = new Resume();
22+
resume4.setUuid("uuid4");
23+
24+
ARRAY_STORAGE.save(resume1);
25+
ARRAY_STORAGE.save(resume2);
26+
ARRAY_STORAGE.save(resume3);
27+
28+
System.out.println("Get resume1: " + ARRAY_STORAGE.get(resume1.getUuid()));
2929
System.out.println("Size: " + ARRAY_STORAGE.size());
3030

3131
System.out.println("Get dummy: " + ARRAY_STORAGE.get("dummy"));
3232

33-
ARRAY_STORAGE.update(r3Update);
34-
System.out.println("Update r3: " + (ARRAY_STORAGE.get("uuid3") == r3Update));
35-
System.out.println("Update non-existing r4");
36-
ARRAY_STORAGE.update(r4);
33+
ARRAY_STORAGE.update(resume3Update);
34+
System.out.println("Update resume3: " + (ARRAY_STORAGE.get("uuid3") == resume3Update));
35+
System.out.println("Update non-existing resume4");
36+
ARRAY_STORAGE.update(resume4);
3737

3838
printAll();
39-
ARRAY_STORAGE.delete(r1.getUuid());
39+
ARRAY_STORAGE.delete(resume1.getUuid());
4040
printAll();
4141
ARRAY_STORAGE.clear();
4242
printAll();
Collapse file

‎src/ru/topjava/webapp/storage/ArrayStorage.java‎

Copy file name to clipboardExpand all lines: src/ru/topjava/webapp/storage/ArrayStorage.java
+17-21Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,38 @@
88
* Array based storage for Resumes
99
*/
1010
public class ArrayStorage {
11-
private Resume[] storage = new Resume[3];
11+
private Resume[] storage = new Resume[10000];
1212
private int size = 0;
1313

1414
public void clear() {
15-
Arrays.fill(storage,null);
15+
Arrays.fill(storage, 0, size, null);
1616
size = 0;
1717
}
1818

19-
public void save(Resume r) {
20-
int resumeIndex = this.getResumeIndex(r.getUuid());
19+
public void save(Resume resume) {
20+
int resumeIndex = getResumeIndex(resume.getUuid());
2121
if (resumeIndex >= 0) {
22-
System.out.println(String.format("ERROR ru.topjava.webapp.storage.ArrayStorage.save: uuid '%1$s' is already exists", r.getUuid()));
22+
System.out.println(String.format("ERROR ru.topjava.webapp.storage.ArrayStorage.save: uuid '%1$s' is already exists", resume.getUuid()));
2323
} else if (size >= storage.length) {
2424
System.out.println("ERROR ru.topjava.webapp.storage.ArrayStorage.save: storage is full");
2525
} else {
26-
storage[size] = r;
26+
storage[size] = resume;
2727
size++;
2828
}
2929
}
3030

3131
public Resume get(String uuid) {
32-
int resumeIndex = this.getResumeIndex(uuid);
32+
int resumeIndex = getResumeIndex(uuid);
3333
if (resumeIndex < 0) {
3434
System.out.println(String.format("ERROR ru.topjava.webapp.storage.ArrayStorage.get: uuid '%1$s' is not exists", uuid));
35+
return null;
3536
} else {
3637
return storage[resumeIndex];
3738
}
38-
return null;
3939
}
4040

4141
public void delete(String uuid) {
42-
int resumeIndex = this.getResumeIndex(uuid);
42+
int resumeIndex = getResumeIndex(uuid);
4343
if (resumeIndex < 0) {
4444
System.out.println(String.format("ERROR ru.topjava.webapp.storage.ArrayStorage.delete: uuid '%1$s' is not exists", uuid));
4545
} else {
@@ -60,23 +60,19 @@ public int size() {
6060
return size;
6161
}
6262

63-
public void update(Resume r) {
64-
int resumeIndex = this.getResumeIndex(r.getUuid());
63+
public void update(Resume resume) {
64+
int resumeIndex = getResumeIndex(resume.getUuid());
6565
if (resumeIndex < 0) {
66-
System.out.println(String.format("ERROR ru.topjava.webapp.storage.ArrayStorage.update: uuid '%1$s' is not exists", r.getUuid()));
66+
System.out.println(String.format("ERROR ru.topjava.webapp.storage.ArrayStorage.update: uuid '%1$s' is not exists", resume.getUuid()));
6767
} else {
68-
storage[resumeIndex] = r;
68+
storage[resumeIndex] = resume;
6969
}
7070
}
7171

72-
public int getResumeIndex(String uuid) {
73-
if (uuid == null) {
74-
System.out.println("ERROR ru.topjava.webapp.storage.ArrayStorage.getResumeIndex: uuid is null");
75-
} else {
76-
for (int i = 0; i < size; i++) {
77-
if (storage[i].getUuid().equals(uuid)) {
78-
return i;
79-
}
72+
private int getResumeIndex(String uuid) {
73+
for (int i = 0; i < size; i++) {
74+
if (storage[i].getUuid().equals(uuid)) {
75+
return i;
8076
}
8177
}
8278
return -1;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.