From 6eedc15f4f97981959fa6fa68b0e5e89ad0dd84b Mon Sep 17 00:00:00 2001 From: Karsten Jeppesen Date: Tue, 2 Mar 2021 19:58:40 +0100 Subject: [PATCH] ConditionDemo: removed final keyword not to confuse students --- ConditionDemo/src/Consumer.java | 4 ++-- ConditionDemo/src/Producer.java | 4 ++-- ConditionDemo/src/SharedFiFoQueue.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ConditionDemo/src/Consumer.java b/ConditionDemo/src/Consumer.java index 38edaba..82e4b84 100644 --- a/ConditionDemo/src/Consumer.java +++ b/ConditionDemo/src/Consumer.java @@ -5,10 +5,10 @@ import java.util.HashSet; import java.util.Set; public class Consumer extends Thread { - private final Set knownObjects = new HashSet(); + private Set knownObjects = new HashSet(); private int total = 0; private int unique = 0; - private final SharedFiFoQueue queue; + private SharedFiFoQueue queue; public Consumer(SharedFiFoQueue queue) { this.queue = queue; diff --git a/ConditionDemo/src/Producer.java b/ConditionDemo/src/Producer.java index fca2533..fedaa63 100644 --- a/ConditionDemo/src/Producer.java +++ b/ConditionDemo/src/Producer.java @@ -8,8 +8,8 @@ import java.io.FileReader; import java.io.IOException; public class Producer extends Thread { - private final static String FILENAME = "input.txt"; - private final SharedFiFoQueue queue; + private static String FILENAME = "input.txt"; + private SharedFiFoQueue queue; public Producer(SharedFiFoQueue queue) { this.queue = queue; diff --git a/ConditionDemo/src/SharedFiFoQueue.java b/ConditionDemo/src/SharedFiFoQueue.java index 2ca850e..634a7c0 100644 --- a/ConditionDemo/src/SharedFiFoQueue.java +++ b/ConditionDemo/src/SharedFiFoQueue.java @@ -10,9 +10,9 @@ public class SharedFiFoQueue { private int PosW = 0; private int PosR = 0; - private final Lock lock = new ReentrantLock(); - private final Condition isEmpty = lock.newCondition(); - private final Condition isFull = lock.newCondition(); + private Lock lock = new ReentrantLock(); + private Condition isEmpty = lock.newCondition(); + private Condition isFull = lock.newCondition(); public SharedFiFoQueue(int capacity) { this.elems = new Object[capacity];