From e04914a559ef7d92a3ca091a8be405985d6c97e9 Mon Sep 17 00:00:00 2001 From: matiduda Date: Fri, 8 Apr 2022 10:51:36 +0200 Subject: [PATCH 1/5] Added .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..40abbc4b --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.class +.vscode/ +.code-workspace \ No newline at end of file From 8ca214bbf832d8812a32866adbfcb521c8b6e8ac Mon Sep 17 00:00:00 2001 From: matiduda Date: Fri, 8 Apr 2022 10:57:26 +0200 Subject: [PATCH 2/5] Modification of FIFORhymer.java --- src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index 489e7b3c..98ae441e 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -1,5 +1,10 @@ package edu.kis.vh.nursery; +/* + +This is a sample comment, so I can check if Git pushing is +working properly. TODO Remove this comment */ + public class FIFORhymer extends defaultCountingOutRhymer { public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); From 7a331a10ff3446da886cba5d6a5a2b4bc2e1eb40 Mon Sep 17 00:00:00 2001 From: unknown <235857@carbon.cti.p.lodz.pl> Date: Wed, 13 Apr 2022 14:41:06 +0200 Subject: [PATCH 3/5] podpunkt 3.1 --- eclipse-formatter.xml | 315 ++++++++++++++++++ .../java/edu/kis/vh/nursery/FIFORhymer.java | 16 +- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 8 +- 3 files changed, 327 insertions(+), 12 deletions(-) create mode 100644 eclipse-formatter.xml diff --git a/eclipse-formatter.xml b/eclipse-formatter.xml new file mode 100644 index 00000000..7f8c57d1 --- /dev/null +++ b/eclipse-formatter.xml @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index 98ae441e..3e862390 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -8,19 +8,19 @@ 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 62b1d00b..0bb4c137 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 134601da37f2ca173ac331fe6e0af8b89d883530 Mon Sep 17 00:00:00 2001 From: 235857 <235857@CARBON.CTI.P.LODZ.PL> Date: Wed, 13 Apr 2022 14:52:08 +0200 Subject: [PATCH 4/5] code formatting --- .gitignore | 3 +- .../vh/nursery/defaultCountingOutRhymer.java | 38 +++++++++---------- .../vh/nursery/factory/Rhymersfactory.java | 22 +++++------ .../java/edu/kis/vh/nursery/list/Node.java | 2 +- .../java/edu/kis/vh/nursery/RhymersDemo.java | 16 ++++---- 5 files changed, 41 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 40abbc4b..9ad78e1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.class .vscode/ -.code-workspace \ No newline at end of file +.code-workspace +eclipse-formatter.xml \ 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 d54e3474..f904a86a 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 b46d7b5e..7809def2 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 0db70aec..0c1a9016 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; } - + } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index 7897c2c2..389e260e 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -9,27 +9,27 @@ class RhymersDemo { public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); - + defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), - factory.GetFIFORhymer(), factory.GetHanoiRhymer()}; - + factory.GetFIFORhymer(), factory.GetHanoiRhymer() }; + for (int i = 1; i < 15; i++) for (int j = 0; j < 3; j++) rhymers[j].countIn(i); - + java.util.Random rn = new java.util.Random(); for (int i = 1; i < 15; i++) rhymers[3].countIn(rn.nextInt(20)); - + for (int i = 0; i < rhymers.length; i++) { while (!rhymers[i].callCheck()) System.out.print(rhymers[i].countOut() + " "); System.out.println(); } - + System.out.println("total rejected is " + ((HanoiRhymer) rhymers[3]).reportRejected()); - + } - + } \ No newline at end of file From 1335da462dace7223fd8996c113d9f1862e8f23f Mon Sep 17 00:00:00 2001 From: Mateusz Duda Date: Fri, 6 May 2022 11:34:23 +0200 Subject: [PATCH 5/5] Added code formatting --- .../edu/kis/vh/nursery/factory/DefaultRhymersFactory.java | 3 +-- .../factory/{Rhymersfactory.java => RhymersFactory.java} | 2 +- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 6 ++---- 3 files changed, 4 insertions(+), 7 deletions(-) rename src/main/java/edu/kis/vh/nursery/factory/{Rhymersfactory.java => RhymersFactory.java} (89%) 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 37aa0f64..b6bdedd1 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java @@ -3,9 +3,8 @@ 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 { +public class DefaultRhymersFactory implements RhymersFactory { @Override public defaultCountingOutRhymer GetStandardRhymer() { diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java similarity index 89% rename from src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java rename to src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java index 7809def2..766aabfc 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java @@ -2,7 +2,7 @@ import edu.kis.vh.nursery.defaultCountingOutRhymer; -public interface Rhymersfactory { +public interface RhymersFactory { public defaultCountingOutRhymer GetStandardRhymer(); diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index 389e260e..a5239b31 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -1,14 +1,12 @@ 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; +import edu.kis.vh.nursery.factory.RhymersFactory; class RhymersDemo { public static void main(String[] args) { - Rhymersfactory factory = new DefaultRhymersFactory(); + RhymersFactory factory = new DefaultRhymersFactory(); defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), factory.GetFIFORhymer(), factory.GetHanoiRhymer() };