From 3b856e896587a55f9838690a8015407700440c70 Mon Sep 17 00:00:00 2001
From: 245857 <245857@helium.com>
Date: Mon, 8 Apr 2024 12:54:57 +0200
Subject: [PATCH 01/18] 1. dodanie pliku gitignore
---
.gitignore.txt | 1 +
.idea/.gitignore | 8 ++++++++
.idea/compiler.xml | 13 +++++++++++++
.idea/jarRepositories.xml | 20 ++++++++++++++++++++
.idea/misc.xml | 12 ++++++++++++
.idea/vcs.xml | 6 ++++++
6 files changed, 60 insertions(+)
create mode 100644 .gitignore.txt
create mode 100644 .idea/.gitignore
create mode 100644 .idea/compiler.xml
create mode 100644 .idea/jarRepositories.xml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/vcs.xml
diff --git a/.gitignore.txt b/.gitignore.txt
new file mode 100644
index 00000000..62c89355
--- /dev/null
+++ b/.gitignore.txt
@@ -0,0 +1 @@
+.idea/
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..13566b81
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 00000000..7b9e5be3
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 00000000..712ab9d9
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..67e1e611
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
From e5d239df36efe40a801e6d2950697662d79f3745 Mon Sep 17 00:00:00 2001
From: 245857 <245857@helium.com>
Date: Mon, 8 Apr 2024 13:02:04 +0200
Subject: [PATCH 02/18] 2. Zmiana w formatowaniu kodu
---
src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
index 755b2d58..ec0691fc 100644
--- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
@@ -2,16 +2,16 @@
public class HanoiRhymer extends defaultCountingOutRhymer {
-int totalRejected = 0;
+ int totalRejected = 0;
public int reportRejected() {
return totalRejected;
}
public void countIn(int in) {
- if (!callCheck() && in > peekaboo())
+ if (!callCheck() && in > peekaboo())
totalRejected++;
- else
- super.countIn(in);
+ else
+ super.countIn(in);
}
}
From 6b2eb54e36428c7e3a53ff86c6900a3ca1650e60 Mon Sep 17 00:00:00 2001
From: Milosz <245857@edu.p.lodz.pl>
Date: Sat, 13 Apr 2024 18:57:54 +0200
Subject: [PATCH 03/18] 4.1 poprawa nazw klas
---
.idea/uiDesigner.xml | 124 ++++++++++++++++++
...ntingOutRhymer.java => DefaultRhymer.java} | 2 +-
2 files changed, 125 insertions(+), 1 deletion(-)
create mode 100644 .idea/uiDesigner.xml
rename src/main/java/edu/kis/vh/nursery/{defaultCountingOutRhymer.java => DefaultRhymer.java} (95%)
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 00000000..2b63946d
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
similarity index 95%
rename from src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
rename to src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
index 199abf6d..7acb550c 100644
--- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
@@ -1,6 +1,6 @@
package edu.kis.vh.nursery;
-public class defaultCountingOutRhymer {
+public class DefaultRhymer {
private int[] NUMBERS = new int[12];
From 989876f750e972ee427872dbc5674b2dbde1acf1 Mon Sep 17 00:00:00 2001
From: Milosz <245857@edu.p.lodz.pl>
Date: Sat, 13 Apr 2024 19:01:15 +0200
Subject: [PATCH 04/18] 4.2 poprawa nazw metod
---
.idea/misc.xml | 1 -
src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 4 ++--
src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 4 ++--
.../vh/nursery/factory/DefaultRhymersFactory.java | 15 +++++++--------
.../kis/vh/nursery/factory/Rhymersfactory.java | 10 +++++-----
src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 6 ++----
.../java/edu/kis/vh/nursery/RhymersJUnitTest.java | 10 +++++-----
7 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 67e1e611..42e3abed 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-
diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
index 28591ada..667654dc 100644
--- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
@@ -1,8 +1,8 @@
package edu.kis.vh.nursery;
-public class FIFORhymer extends defaultCountingOutRhymer {
+public class FIFORhymer extends DefaultRhymer {
- public defaultCountingOutRhymer temp = new defaultCountingOutRhymer();
+ public DefaultRhymer temp = new DefaultRhymer();
@Override
public int countOut() {
diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
index ec0691fc..44380fae 100644
--- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
@@ -1,10 +1,10 @@
package edu.kis.vh.nursery;
-public class HanoiRhymer extends defaultCountingOutRhymer {
+public class HanoiRhymer extends DefaultRhymer {
int totalRejected = 0;
- public int reportRejected() {
+ public int printRejectedReports() {
return totalRejected;
}
diff --git a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java
index 60ba2a16..1db5c31d 100644
--- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java
+++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java
@@ -1,29 +1,28 @@
package edu.kis.vh.nursery.factory;
-import edu.kis.vh.nursery.defaultCountingOutRhymer;
+import edu.kis.vh.nursery.DefaultRhymer;
import edu.kis.vh.nursery.FIFORhymer;
import edu.kis.vh.nursery.HanoiRhymer;
-import edu.kis.vh.nursery.factory.Rhymersfactory;
public class DefaultRhymersFactory implements Rhymersfactory {
@Override
- public defaultCountingOutRhymer GetStandardRhymer() {
- return new defaultCountingOutRhymer();
+ public DefaultRhymer GetStandardRhymer() {
+ return new DefaultRhymer();
}
@Override
- public defaultCountingOutRhymer GetFalseRhymer() {
- return new defaultCountingOutRhymer();
+ public DefaultRhymer GetFalseRhymer() {
+ return new DefaultRhymer();
}
@Override
- public defaultCountingOutRhymer GetFIFORhymer() {
+ public DefaultRhymer GetFIFORhymer() {
return new FIFORhymer();
}
@Override
- public defaultCountingOutRhymer GetHanoiRhymer() {
+ public DefaultRhymer GetHanoiRhymer() {
return new HanoiRhymer();
}
diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java
index 033755d0..cd7d29dd 100644
--- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java
+++ b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java
@@ -1,15 +1,15 @@
package edu.kis.vh.nursery.factory;
-import edu.kis.vh.nursery.defaultCountingOutRhymer;
+import edu.kis.vh.nursery.DefaultRhymer;
public interface Rhymersfactory {
- public defaultCountingOutRhymer GetStandardRhymer();
+ public DefaultRhymer GetStandardRhymer();
- public defaultCountingOutRhymer GetFalseRhymer();
+ public DefaultRhymer GetFalseRhymer();
- public defaultCountingOutRhymer GetFIFORhymer();
+ public DefaultRhymer GetFIFORhymer();
- public defaultCountingOutRhymer GetHanoiRhymer();
+ public DefaultRhymer GetHanoiRhymer();
}
diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java
index 05aba9fa..574a742a 100644
--- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java
+++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java
@@ -1,7 +1,5 @@
package edu.kis.vh.nursery;
-import edu.kis.vh.nursery.defaultCountingOutRhymer;
-import edu.kis.vh.nursery.HanoiRhymer;
import edu.kis.vh.nursery.factory.DefaultRhymersFactory;
import edu.kis.vh.nursery.factory.Rhymersfactory;
@@ -10,7 +8,7 @@ class RhymersDemo {
public static void main(String[] args) {
Rhymersfactory factory = new DefaultRhymersFactory();
- defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(),
+ DefaultRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(),
factory.GetFIFORhymer(), factory.GetHanoiRhymer()};
for (int i = 1; i < 15; i++)
@@ -28,7 +26,7 @@ public static void main(String[] args) {
}
System.out.println("total rejected is "
- + ((HanoiRhymer) rhymers[3]).reportRejected());
+ + ((HanoiRhymer) rhymers[3]).printRejectedReports());
}
diff --git a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java
index 144906eb..75a618ff 100644
--- a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java
+++ b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java
@@ -7,7 +7,7 @@ public class RhymersJUnitTest {
@Test
public void testCountIn() {
- defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+ DefaultRhymer rhymer = new DefaultRhymer();
int testValue = 4;
rhymer.countIn(testValue);
@@ -17,7 +17,7 @@ public void testCountIn() {
@Test
public void testCallCheck() {
- defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+ DefaultRhymer rhymer = new DefaultRhymer();
boolean result = rhymer.callCheck();
Assert.assertEquals(true, result);
@@ -29,7 +29,7 @@ public void testCallCheck() {
@Test
public void testIsFull() {
- defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+ DefaultRhymer rhymer = new DefaultRhymer();
final int STACK_CAPACITY = 12;
for (int i = 0; i < STACK_CAPACITY; i++) {
boolean result = rhymer.isFull();
@@ -43,7 +43,7 @@ public void testIsFull() {
@Test
public void testPeekaboo() {
- defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+ DefaultRhymer rhymer = new DefaultRhymer();
final int EMPTY_STACK_VALUE = -1;
int result = rhymer.peekaboo();
@@ -60,7 +60,7 @@ public void testPeekaboo() {
@Test
public void testCountOut() {
- defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+ DefaultRhymer rhymer = new DefaultRhymer();
final int EMPTY_STACK_VALUE = -1;
int result = rhymer.countOut();
From 95b7375352ca7cef1fdfa985e971de5fb19b6519 Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Sun, 19 May 2024 13:43:26 +0200
Subject: [PATCH 05/18] 6. zastapienie literalow deklaracjami stalych
---
src/main/java/edu/kis/vh/nursery/DefaultRhymer.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
index 7acb550c..fe7eb1b2 100644
--- a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
@@ -2,6 +2,8 @@
public class DefaultRhymer {
+ public static final int minusOne = -1;
+ public static final int eleven = 11;
private int[] NUMBERS = new int[12];
public int total = -1;
@@ -12,22 +14,22 @@ public void countIn(int in) {
}
public boolean callCheck() {
- return total == -1;
+ return total == minusOne;
}
public boolean isFull() {
- return total == 11;
+ return total == eleven;
}
protected int peekaboo() {
if (callCheck())
- return -1;
+ return minusOne;
return NUMBERS[total];
}
public int countOut() {
if (callCheck())
- return -1;
+ return minusOne;
return NUMBERS[total--];
}
From 727953db134b053c140fd8b3f91f528fff6f1e93 Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Sun, 19 May 2024 13:44:45 +0200
Subject: [PATCH 06/18] 7. ustawienie modyfikatora final przy niemutowalnych
atrybutach
---
src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
index 667654dc..042cd1d5 100644
--- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
@@ -2,7 +2,7 @@
public class FIFORhymer extends DefaultRhymer {
- public DefaultRhymer temp = new DefaultRhymer();
+ public final DefaultRhymer temp = new DefaultRhymer();
@Override
public int countOut() {
From a957c3829cd19cd9eaa7c487630eaf3e506f5e1e Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Sun, 19 May 2024 13:47:57 +0200
Subject: [PATCH 07/18] 8. uzycie @override tam, gdzie to mozliwe
---
src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
index 44380fae..18071843 100644
--- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
@@ -8,6 +8,7 @@ public int printRejectedReports() {
return totalRejected;
}
+ @Override
public void countIn(int in) {
if (!callCheck() && in > peekaboo())
totalRejected++;
From 82d16ce590fa971b865256a646c588def77b3067 Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Sun, 19 May 2024 14:01:55 +0200
Subject: [PATCH 08/18] poprawka
---
src/main/java/edu/kis/vh/nursery/DefaultRhymer.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
index fe7eb1b2..075ab84b 100644
--- a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
@@ -13,13 +13,13 @@ public void countIn(int in) {
NUMBERS[++total] = in;
}
- public boolean callCheck() {
+ public boolean callCheck() {
return total == minusOne;
}
- public boolean isFull() {
- return total == eleven;
- }
+ public boolean isFull() {
+ return total == eleven;
+ }
protected int peekaboo() {
if (callCheck())
From e4ba60a4348f310702d286dcdf349c9d24192457 Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Sun, 19 May 2024 14:03:24 +0200
Subject: [PATCH 09/18] poprawka
---
.../java/edu/kis/vh/nursery/DefaultRhymer.java | 16 +++++++---------
src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 2 +-
.../java/edu/kis/vh/nursery/HanoiRhymer.java | 1 -
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
index 075ab84b..7acb550c 100644
--- a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
@@ -2,8 +2,6 @@
public class DefaultRhymer {
- public static final int minusOne = -1;
- public static final int eleven = 11;
private int[] NUMBERS = new int[12];
public int total = -1;
@@ -13,23 +11,23 @@ public void countIn(int in) {
NUMBERS[++total] = in;
}
- public boolean callCheck() {
- return total == minusOne;
+ public boolean callCheck() {
+ return total == -1;
}
- public boolean isFull() {
- return total == eleven;
- }
+ public boolean isFull() {
+ return total == 11;
+ }
protected int peekaboo() {
if (callCheck())
- return minusOne;
+ return -1;
return NUMBERS[total];
}
public int countOut() {
if (callCheck())
- return minusOne;
+ return -1;
return NUMBERS[total--];
}
diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
index 042cd1d5..667654dc 100644
--- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
@@ -2,7 +2,7 @@
public class FIFORhymer extends DefaultRhymer {
- public final DefaultRhymer temp = new DefaultRhymer();
+ public DefaultRhymer temp = new DefaultRhymer();
@Override
public int countOut() {
diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
index 18071843..44380fae 100644
--- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
@@ -8,7 +8,6 @@ public int printRejectedReports() {
return totalRejected;
}
- @Override
public void countIn(int in) {
if (!callCheck() && in > peekaboo())
totalRejected++;
From b5a2d49a5e44e6591b6d512cca608d232f7b327c Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Sun, 19 May 2024 14:04:31 +0200
Subject: [PATCH 10/18] 6. zastapienie literalow deklaracjami stalych
---
src/main/java/edu/kis/vh/nursery/DefaultRhymer.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
index 7acb550c..fe7eb1b2 100644
--- a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
@@ -2,6 +2,8 @@
public class DefaultRhymer {
+ public static final int minusOne = -1;
+ public static final int eleven = 11;
private int[] NUMBERS = new int[12];
public int total = -1;
@@ -12,22 +14,22 @@ public void countIn(int in) {
}
public boolean callCheck() {
- return total == -1;
+ return total == minusOne;
}
public boolean isFull() {
- return total == 11;
+ return total == eleven;
}
protected int peekaboo() {
if (callCheck())
- return -1;
+ return minusOne;
return NUMBERS[total];
}
public int countOut() {
if (callCheck())
- return -1;
+ return minusOne;
return NUMBERS[total--];
}
From 73a3e6490bbb268dc9dbbeb23ad0c6b74940e2c2 Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Sun, 19 May 2024 14:05:15 +0200
Subject: [PATCH 11/18] 7. ustawienie modyfikatora final przy niemutowalnych
atrybutach
---
src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
index 667654dc..042cd1d5 100644
--- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
@@ -2,7 +2,7 @@
public class FIFORhymer extends DefaultRhymer {
- public DefaultRhymer temp = new DefaultRhymer();
+ public final DefaultRhymer temp = new DefaultRhymer();
@Override
public int countOut() {
From 3dd2d8c62bb94732944da5d3ab6ebcf10909c582 Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Sun, 19 May 2024 14:05:30 +0200
Subject: [PATCH 12/18] 8. uzycie @override tam, gdzie to mozliwe
---
src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
index 44380fae..520aafdd 100644
--- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
@@ -7,7 +7,7 @@ public class HanoiRhymer extends DefaultRhymer {
public int printRejectedReports() {
return totalRejected;
}
-
+ @Override
public void countIn(int in) {
if (!callCheck() && in > peekaboo())
totalRejected++;
From bc55eee6e2413b9dc77ce67550cf823f8006a4ac Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Sun, 19 May 2024 14:08:34 +0200
Subject: [PATCH 13/18] poprawka
---
.../edu/kis/vh/nursery/DefaultRhymer.java | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
index fe7eb1b2..99242324 100644
--- a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
@@ -13,24 +13,24 @@ public void countIn(int in) {
NUMBERS[++total] = in;
}
- public boolean callCheck() {
- return total == minusOne;
+ public boolean callCheck() {
+ return total == minusOne;
+ }
+
+ public boolean isFull() {
+ return total == eleven;
}
-
- public boolean isFull() {
- return total == eleven;
+
+ protected int peekaboo() {
+ if (callCheck())
+ return minusOne;
+ return NUMBERS[total];
}
-
- protected int peekaboo() {
+
+ public int countOut() {
if (callCheck())
return minusOne;
- return NUMBERS[total];
+ return NUMBERS[total--];
}
-
- public int countOut() {
- if (callCheck())
- return minusOne;
- return NUMBERS[total--];
- }
}
From 10fc0ad37e2a937f96fe08dffa6c0bfc02cf675d Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Mon, 20 May 2024 16:57:46 +0200
Subject: [PATCH 14/18] 6. Zastapienie literalow deklaracjami stalych
---
.../edu/kis/vh/nursery/DefaultRhymer.java | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
index 99242324..bf7a7757 100644
--- a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
@@ -2,35 +2,35 @@
public class DefaultRhymer {
- public static final int minusOne = -1;
- public static final int eleven = 11;
- private int[] NUMBERS = new int[12];
+ public static final int DEFAULT_INDEX = -1;
+ public static final int NUMBERS_CAPACITY = 12;
+ private int[] NUMBERS = new int[NUMBERS_CAPACITY];
- public int total = -1;
+ public int DEFAULT_VALUE = -1;
public void countIn(int in) {
if (!isFull())
- NUMBERS[++total] = in;
+ NUMBERS[++DEFAULT_VALUE] = in;
}
public boolean callCheck() {
- return total == minusOne;
+ return DEFAULT_VALUE == DEFAULT_INDEX;
}
public boolean isFull() {
- return total == eleven;
+ return DEFAULT_VALUE == NUMBERS_CAPACITY - 1;
}
protected int peekaboo() {
if (callCheck())
- return minusOne;
- return NUMBERS[total];
+ return DEFAULT_INDEX;
+ return NUMBERS[DEFAULT_VALUE];
}
public int countOut() {
if (callCheck())
- return minusOne;
- return NUMBERS[total--];
+ return DEFAULT_INDEX;
+ return NUMBERS[DEFAULT_VALUE--];
}
}
From e968376500424ae334f1e2eeabb99e951b7ec161 Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Mon, 20 May 2024 16:59:33 +0200
Subject: [PATCH 15/18] 7. Dodanie final przy zmiennych niemutowalnych
---
src/main/java/edu/kis/vh/nursery/DefaultRhymer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
index bf7a7757..08896d9c 100644
--- a/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
@@ -4,7 +4,7 @@ public class DefaultRhymer {
public static final int DEFAULT_INDEX = -1;
public static final int NUMBERS_CAPACITY = 12;
- private int[] NUMBERS = new int[NUMBERS_CAPACITY];
+ private final int[] NUMBERS = new int[NUMBERS_CAPACITY];
public int DEFAULT_VALUE = -1;
From a45bd8fe798d16155cd24fcaaa665e973cfc49eb Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Mon, 20 May 2024 17:00:36 +0200
Subject: [PATCH 16/18] 8. Uzycie @override
---
src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
index 520aafdd..18071843 100644
--- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
@@ -7,6 +7,7 @@ public class HanoiRhymer extends DefaultRhymer {
public int printRejectedReports() {
return totalRejected;
}
+
@Override
public void countIn(int in) {
if (!callCheck() && in > peekaboo())
From 1fb6072d89b2e06b4b30cb55fbe09ffb5b35cace Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Tue, 21 May 2024 08:54:18 +0200
Subject: [PATCH 17/18] 6.1 poprawienie nazewnictwa w pliku IntLinkedList
---
src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java
index 07efc0a2..11a940a3 100644
--- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java
+++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java
@@ -2,6 +2,7 @@
public class IntLinkedList {
+ public static final int FAILURE_VALUE = -1;
Node last;
int i;
@@ -25,13 +26,13 @@ public boolean isFull() {
public int top() {
if (isEmpty())
- return -1;
+ return FAILURE_VALUE;
return last.value;
}
public int pop() {
if (isEmpty())
- return -1;
+ return FAILURE_VALUE;
int ret = last.value;
last = last.prev;
return ret;
From 7273386b3a3876f0123da64a777a4ffae228b37a Mon Sep 17 00:00:00 2001
From: Natalia Balicka <245763@edu.p.lodz.pl>
Date: Tue, 21 May 2024 08:55:27 +0200
Subject: [PATCH 18/18] 7.1 poprawienie modyfikatora final we wszystkich
plikach
---
src/main/java/edu/kis/vh/nursery/list/Node.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/edu/kis/vh/nursery/list/Node.java b/src/main/java/edu/kis/vh/nursery/list/Node.java
index 0a2cd75e..abd6bc5c 100644
--- a/src/main/java/edu/kis/vh/nursery/list/Node.java
+++ b/src/main/java/edu/kis/vh/nursery/list/Node.java
@@ -2,7 +2,7 @@
public class Node {
- public int value;
+ public final int value;
public Node prev, next;
public Node(int i) {