From db5c26969a7eb49f0dc69fd479d5086a88f70a79 Mon Sep 17 00:00:00 2001
From: Michal Urbaniak <245954@edu.p.lodz.pl>
Date: Sun, 9 Jun 2024 20:01:09 +0200
Subject: [PATCH 1/9] 1.dodanie pliku gitignore
---
.gitignore | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..e69de29b
From 1c84a9b3dce897908dd499cf99c7479bee3e8dd3 Mon Sep 17 00:00:00 2001
From: Michal Urbaniak <245954@edu.p.lodz.pl>
Date: Sun, 9 Jun 2024 20:03:35 +0200
Subject: [PATCH 2/9] 2.Naprawa wciec w klasie HanoiRhymer
---
.idea/.gitignore | 8 ++++++++
.idea/compiler.xml | 13 +++++++++++++
.idea/jarRepositories.xml | 20 ++++++++++++++++++++
.idea/misc.xml | 12 ++++++++++++
.idea/vcs.xml | 6 ++++++
5 files changed, 59 insertions(+)
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/.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..9dc782bb
--- /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 29558da6ac9bcaafb7538437693ddf46aa1758e5 Mon Sep 17 00:00:00 2001
From: Michal Urbaniak <245954@edu.p.lodz.pl>
Date: Sun, 9 Jun 2024 20:20:48 +0200
Subject: [PATCH 3/9] Naprawa wciec w HanoiRhymer
---
.gitignore | 1 +
.idea/.gitignore | 8 --------
.idea/compiler.xml | 13 -------------
.idea/jarRepositories.xml | 20 --------------------
.idea/misc.xml | 12 ------------
.idea/vcs.xml | 6 ------
6 files changed, 1 insertion(+), 59 deletions(-)
delete mode 100644 .idea/.gitignore
delete mode 100644 .idea/compiler.xml
delete mode 100644 .idea/jarRepositories.xml
delete mode 100644 .idea/misc.xml
delete mode 100644 .idea/vcs.xml
diff --git a/.gitignore b/.gitignore
index e69de29b..62c89355 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea/
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b81..00000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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
deleted file mode 100644
index 7b9e5be3..00000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index 712ab9d9..00000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 9dc782bb..00000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddf..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
From 1e7e250c9904bf837c84817f8ef07b8ac8732cc9 Mon Sep 17 00:00:00 2001
From: Michal Urbaniak <245954@edu.p.lodz.pl>
Date: Sun, 9 Jun 2024 20:22:19 +0200
Subject: [PATCH 4/9] merge dwoch branchy
---
.../java/edu/kis/vh/nursery/FIFORhymer.java | 14 +++----
.../java/edu/kis/vh/nursery/HanoiRhymer.java | 8 ++--
.../vh/nursery/defaultCountingOutRhymer.java | 38 +++++++++----------
.../vh/nursery/factory/Rhymersfactory.java | 22 +++++------
.../java/edu/kis/vh/nursery/list/Node.java | 2 +-
5 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
index 28591ada..13f788eb 100644
--- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
@@ -3,19 +3,17 @@
public class FIFORhymer extends defaultCountingOutRhymer {
public defaultCountingOutRhymer temp = new defaultCountingOutRhymer();
-
+
@Override
public int countOut() {
while (!callCheck())
-
- temp.countIn(super.countOut());
-
+ temp.countIn(super.countOut());
+
int ret = temp.countOut();
-
+
while (!temp.callCheck())
-
- countIn(temp.countOut());
-
+ countIn(temp.countOut());
+
return ret;
}
}
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);
}
}
diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
index 199abf6d..89033a01 100644
--- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
@@ -11,24 +11,24 @@ public void countIn(int in) {
NUMBERS[++total] = in;
}
- public boolean callCheck() {
- return total == -1;
- }
-
- public boolean isFull() {
- return total == 11;
- }
-
- protected int peekaboo() {
- if (callCheck())
- return -1;
- return NUMBERS[total];
- }
-
- public int countOut() {
- if (callCheck())
- return -1;
- return NUMBERS[total--];
- }
+ public boolean callCheck() {
+ return total == -1;
+ }
+
+ public boolean isFull() {
+ return total == 11;
+ }
+
+ protected int peekaboo() {
+ if (callCheck())
+ return -1;
+ return NUMBERS[total];
+ }
+
+ public int countOut() {
+ if (callCheck())
+ return -1;
+ return NUMBERS[total--];
+ }
}
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..b480c321 100644
--- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java
+++ b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java
@@ -2,14 +2,14 @@
import edu.kis.vh.nursery.defaultCountingOutRhymer;
- public interface Rhymersfactory {
-
- public defaultCountingOutRhymer GetStandardRhymer();
-
- public defaultCountingOutRhymer GetFalseRhymer();
-
- public defaultCountingOutRhymer GetFIFORhymer();
-
- public defaultCountingOutRhymer GetHanoiRhymer();
-
- }
+public interface Rhymersfactory {
+
+ public defaultCountingOutRhymer GetStandardRhymer();
+
+ public defaultCountingOutRhymer GetFalseRhymer();
+
+ public defaultCountingOutRhymer GetFIFORhymer();
+
+ public defaultCountingOutRhymer GetHanoiRhymer();
+
+}
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..1704f3ce 100644
--- a/src/main/java/edu/kis/vh/nursery/list/Node.java
+++ b/src/main/java/edu/kis/vh/nursery/list/Node.java
@@ -8,5 +8,5 @@ public class Node {
public Node(int i) {
value = i;
}
-
+
}
From 39931f4dd40407ab2f187d173f32ec2110e11e34 Mon Sep 17 00:00:00 2001
From: Michal Urbaniak <245954@edu.p.lodz.pl>
Date: Sun, 9 Jun 2024 20:32:26 +0200
Subject: [PATCH 5/9] Zmiana konwencji nazewniczej
---
src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 4 ++--
src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +-
.../kis/vh/nursery/defaultCountingOutRhymer.java | 2 +-
.../vh/nursery/factory/DefaultRhymersFactory.java | 15 +++++++--------
.../kis/vh/nursery/factory/Rhymersfactory.java | 10 +++++-----
src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 4 +---
.../java/edu/kis/vh/nursery/RhymersJUnitTest.java | 10 +++++-----
7 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
index 13f788eb..3cea0867 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 DefaultCountingOutRhymer {
- public defaultCountingOutRhymer temp = new defaultCountingOutRhymer();
+ public DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer();
@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..89ffa912 100644
--- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
@@ -1,6 +1,6 @@
package edu.kis.vh.nursery;
-public class HanoiRhymer extends defaultCountingOutRhymer {
+public class HanoiRhymer extends DefaultCountingOutRhymer {
int totalRejected = 0;
diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
index 89033a01..b46a9dc8 100644
--- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
@@ -1,6 +1,6 @@
package edu.kis.vh.nursery;
-public class defaultCountingOutRhymer {
+public class DefaultCountingOutRhymer {
private int[] NUMBERS = new int[12];
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..9f3a9638 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.DefaultCountingOutRhymer;
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 DefaultCountingOutRhymer GetStandardRhymer() {
+ return new DefaultCountingOutRhymer();
}
@Override
- public defaultCountingOutRhymer GetFalseRhymer() {
- return new defaultCountingOutRhymer();
+ public DefaultCountingOutRhymer GetFalseRhymer() {
+ return new DefaultCountingOutRhymer();
}
@Override
- public defaultCountingOutRhymer GetFIFORhymer() {
+ public DefaultCountingOutRhymer GetFIFORhymer() {
return new FIFORhymer();
}
@Override
- public defaultCountingOutRhymer GetHanoiRhymer() {
+ public DefaultCountingOutRhymer 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 b480c321..ded94a97 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.DefaultCountingOutRhymer;
public interface Rhymersfactory {
- public defaultCountingOutRhymer GetStandardRhymer();
+ public DefaultCountingOutRhymer GetStandardRhymer();
- public defaultCountingOutRhymer GetFalseRhymer();
+ public DefaultCountingOutRhymer GetFalseRhymer();
- public defaultCountingOutRhymer GetFIFORhymer();
+ public DefaultCountingOutRhymer GetFIFORhymer();
- public defaultCountingOutRhymer GetHanoiRhymer();
+ public DefaultCountingOutRhymer 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..a1f89c7f 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(),
+ DefaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(),
factory.GetFIFORhymer(), factory.GetHanoiRhymer()};
for (int i = 1; i < 15; i++)
diff --git a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java
index 144906eb..f0f88d99 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();
+ DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer();
int testValue = 4;
rhymer.countIn(testValue);
@@ -17,7 +17,7 @@ public void testCountIn() {
@Test
public void testCallCheck() {
- defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+ DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer();
boolean result = rhymer.callCheck();
Assert.assertEquals(true, result);
@@ -29,7 +29,7 @@ public void testCallCheck() {
@Test
public void testIsFull() {
- defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+ DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer();
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();
+ DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer();
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();
+ DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer();
final int EMPTY_STACK_VALUE = -1;
int result = rhymer.countOut();
From 2d3d3b37ae208271fa2bda24f6437710e6d32e6b Mon Sep 17 00:00:00 2001
From: Michal Urbaniak <245954@edu.p.lodz.pl>
Date: Sun, 9 Jun 2024 21:32:41 +0200
Subject: [PATCH 6/9] 9.Zmiana widocznosci
---
src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 4 ++--
src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 4 ++--
.../java/edu/kis/vh/nursery/defaultCountingOutRhymer.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
index 3cea0867..42b1e43b 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 DefaultCountingOutRhymer {
- public DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer();
+ private DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer();
@Override
public int countOut() {
@@ -16,4 +16,4 @@ public int countOut() {
return ret;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
index 89ffa912..a7eb834e 100644
--- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
@@ -2,7 +2,7 @@
public class HanoiRhymer extends DefaultCountingOutRhymer {
- int totalRejected = 0;
+ private int totalRejected = 0;
public int reportRejected() {
return totalRejected;
@@ -14,4 +14,4 @@ public void countIn(int in) {
else
super.countIn(in);
}
-}
+}
\ 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/defaultCountingOutRhymer.java
index b46a9dc8..083f261a 100644
--- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
@@ -4,7 +4,7 @@ public class DefaultCountingOutRhymer {
private int[] NUMBERS = new int[12];
- public int total = -1;
+ private int total = -1;
public void countIn(int in) {
if (!isFull())
@@ -31,4 +31,4 @@ public int countOut() {
return NUMBERS[total--];
}
-}
+}
\ No newline at end of file
From 0d9bd61056738b12b268fce6aad2ba06f1b824d4 Mon Sep 17 00:00:00 2001
From: Michal Urbaniak <245954@edu.p.lodz.pl>
Date: Sun, 9 Jun 2024 21:36:47 +0200
Subject: [PATCH 7/9] 10.Wygenerowanie gettera
---
.../java/edu/kis/vh/nursery/defaultCountingOutRhymer.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
index 083f261a..b3fe7da3 100644
--- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
@@ -4,6 +4,10 @@ public class DefaultCountingOutRhymer {
private int[] NUMBERS = new int[12];
+ public int getTotal() {
+ return total;
+ }
+
private int total = -1;
public void countIn(int in) {
From 2d24d26612655d444a83c742618b983dbb3b11ba Mon Sep 17 00:00:00 2001
From: Michal Urbaniak <245954@edu.p.lodz.pl>
Date: Sun, 9 Jun 2024 21:43:10 +0200
Subject: [PATCH 8/9] 11.Hermetyzacja
---
src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 8 ++++++++
src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 8 ++++++++
.../java/edu/kis/vh/nursery/defaultCountingOutRhymer.java | 7 +++++++
3 files changed, 23 insertions(+)
diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
index 42b1e43b..e677ed6e 100644
--- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
@@ -16,4 +16,12 @@ public int countOut() {
return ret;
}
+
+ public DefaultCountingOutRhymer getTemp() {
+ return temp;
+ }
+
+ public void setTemp(DefaultCountingOutRhymer temp) {
+ this.temp = temp;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
index a7eb834e..bc90e6ed 100644
--- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
@@ -14,4 +14,12 @@ public void countIn(int in) {
else
super.countIn(in);
}
+
+ public int getTotalRejected() {
+ return totalRejected;
+ }
+
+ public void setTotalRejected(int totalRejected) {
+ this.totalRejected = totalRejected;
+ }
}
\ 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/defaultCountingOutRhymer.java
index b3fe7da3..821ed0bd 100644
--- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
@@ -35,4 +35,11 @@ public int countOut() {
return NUMBERS[total--];
}
+ public int[] getNUMBERS() {
+ return NUMBERS;
+ }
+
+ public void setNUMBERS(int[] NUMBERS) {
+ this.NUMBERS = NUMBERS;
+ }
}
\ No newline at end of file
From 18de0c385b46cc8b01d7869738bd3cc799330501 Mon Sep 17 00:00:00 2001
From: Michal Urbaniak <245954@edu.p.lodz.pl>
Date: Sun, 9 Jun 2024 21:46:04 +0200
Subject: [PATCH 9/9] 12.Usuniecie niepotrzebnych setterow
---
src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 4 ----
.../java/edu/kis/vh/nursery/defaultCountingOutRhymer.java | 4 ----
2 files changed, 8 deletions(-)
diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
index e677ed6e..e0790f3b 100644
--- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
@@ -20,8 +20,4 @@ public int countOut() {
public DefaultCountingOutRhymer getTemp() {
return temp;
}
-
- public void setTemp(DefaultCountingOutRhymer temp) {
- this.temp = temp;
- }
}
\ 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/defaultCountingOutRhymer.java
index 821ed0bd..8fbd820f 100644
--- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
@@ -38,8 +38,4 @@ public int countOut() {
public int[] getNUMBERS() {
return NUMBERS;
}
-
- public void setNUMBERS(int[] NUMBERS) {
- this.NUMBERS = NUMBERS;
- }
}
\ No newline at end of file