18 Commits
Author SHA1 Message Date
schuhmannje82308 5f9230815a Merge origin/JensV2 into JensV2 2023-11-28 12:28:18 +01:00
schuhmannje82308 7406d7cdd3 Abgabe 2023-11-28 12:28:05 +01:00
ahren dc4291d47a gesäubert 2023-11-28 11:53:07 +01:00
ahren 5f5bceb3b8 Merge origin/JensV2 into JensV2 2023-11-28 11:42:30 +01:00
ahren 61e101b877 inkl Ohmlogger txt datei 2023-11-28 11:42:14 +01:00
ahren 03251b36f5 inkl Ohmlogger txt datei 2023-11-28 11:39:59 +01:00
schuhmannje82308 4705e399f9 JavaDocs 2023-11-27 12:18:16 +01:00
schuhmannje82308 1aaabfe73e Dreier perfektioniert 2023-11-21 17:06:09 +01:00
schuhmannje82308 964fc35834 Dreier optimiert 2023-11-21 16:28:06 +01:00
ahren 6d20c28e4f ohmLogger funktioniert, aber drei gleich nicht... 2023-11-21 15:04:30 +01:00
ahren 5e3b1b7f20 ohmLogger funktioniert, aber drei gleich nicht... 2023-11-21 15:03:17 +01:00
ahren 1ddb300546 ohmLogger Warning drin 2023-11-21 13:03:16 +01:00
schuhmannje82308 13483d909c Wuerfel wuerfelt 2023-11-21 12:51:38 +01:00
schuhmannje82308 50deb6c1c9 Draft2 2023-11-21 11:50:04 +01:00
schuhmannje82308 5be14364fd Test 2023-11-21 10:22:59 +01:00
schuhmannje82308 1e899d7e62 Bugfixing 2023-11-20 17:56:37 +01:00
schuhmannje82308 6ae236facd Generators implementiert 2023-11-20 17:38:28 +01:00
schuhmannje82308 d8454b90de Generator Model gekapselt 2023-11-20 13:12:20 +01:00
12 changed files with 589 additions and 113 deletions
+145
View File
@@ -0,0 +1,145 @@
| 2023-11-28T12:09:28.433757500 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:09:28.469713800 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:09:29.699390 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:09:29.701067600 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:09:29.711254700 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 114 |
| 2023-11-28T12:09:30.747813900 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:09:30.748532600 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:09:32.605015500 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:09:32.606067700 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:09:32.606712600 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 556 |
| 2023-11-28T12:09:33.499366900 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:09:33.499366900 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:09:33.501063400 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 556 |
| 2023-11-28T12:09:34.504396 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:09:34.505430200 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:09:35.513390700 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:09:35.513390700 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:09:35.513390700 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 544 |
| 2023-11-28T12:09:36.521840500 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:09:36.521840500 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:09:37.197352 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:09:37.198350200 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:09:37.198679400 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 511 |
| 2023-11-28T12:09:38.246307900 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:09:38.246307900 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:09:39.348837600 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:09:39.389536200 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:09:39.389536200 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 242 |
| 2023-11-28T12:09:40.706097800 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:09:40.751600800 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:09:41.679364 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:09:41.679364 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:09:41.680620100 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 466 |
| 2023-11-28T12:09:42.768099300 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:09:42.768099300 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:09:43.682658600 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:09:43.682658600 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:09:43.683945800 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 465 |
| 2023-11-28T12:09:44.651421 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:09:44.651421 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:09:46.762910100 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:09:46.762910100 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:09:46.764158200 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 441 |
| 2023-11-28T12:10:46.087069900 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:10:46.088630900 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:10:51.139050200 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:51.139050200 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:51.147505800 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:51.694431600 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:51.694431600 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:51.695173900 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:52.518216 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:52.520450500 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:52.521119 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:52.727710800 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:52.727710800 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:52.728462800 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:52.923203200 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:52.924766600 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:52.925372800 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:53.119851300 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:53.119851300 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:53.120847700 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:53.328334 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:53.328334 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:53.329263600 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:53.546927100 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:53.546927100 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:53.553801700 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:53.776855500 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:53.776855500 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:53.778044800 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:53.982088200 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:53.990924100 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:53.991478500 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:54.208730700 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:54.209743200 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:54.210143200 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:54.402328200 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:54.402328200 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:54.403326800 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:54.611448500 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:54.611448500 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:54.611448500 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:54.813837400 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:54.814194800 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:54.815035500 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:55.037588300 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:55.037588300 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:55.038388500 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:55.561208500 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:55.562162100 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:55.562528800 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:55.778646800 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:10:55.778646800 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:10:55.778646800 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 266 |
| 2023-11-28T12:10:56.939211600 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:10:56.939211600 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:10:58.174780800 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:10:58.175767100 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:10:58.855601400 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:10:58.858727 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:10:59.057981100 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:10:59.057981100 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:10:59.254540200 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:10:59.254540200 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:10:59.432098500 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:10:59.439079300 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:10:59.620527100 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:10:59.621538200 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:10:59.802782700 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:10:59.802782700 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:00.004424 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:00.005424200 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:00.183865700 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:00.183865700 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:00.371096500 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:00.371096500 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:00.565349300 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:00.566358500 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:00.735101700 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:00.735101700 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:00.925614500 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:00.925614500 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:01.114057500 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:01.114057500 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:01.301556600 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:01.301556600 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:01.486965200 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:01.486965200 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:01.681669 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:01.681669 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:01.879019 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:01.879019 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:02.080826800 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:02.081886800 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:02.285759200 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:02.285759200 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:02.509117500 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:02.510126 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:02.710700200 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T12:11:02.711687300 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T12:11:03.785108700 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T12:11:03.785108700 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T12:11:03.785108700 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 215 |
+15
View File
@@ -0,0 +1,15 @@
| 2023-11-28T11:37:42.390252 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T11:37:42.393278400 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T11:37:43.136932500 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T11:37:43.137930 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T11:37:43.143407 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 522 |
| 2023-11-28T11:38:59.188169300 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T11:38:59.189224300 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T11:39:00.790984600 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T11:39:00.791922600 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T11:39:00.800778 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 463 |
| 2023-11-28T11:39:02.989252600 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt |
| 2023-11-28T11:39:02.990717700 | INFO | bandit.Model.Zahlengenerator | Generator gestartet |
| 2023-11-28T11:39:04.198394300 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt |
| 2023-11-28T11:39:04.214775 | INFO | bandit.Model.Zahlengenerator | Generator gestopt |
| 2023-11-28T11:39:04.215990800 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 544 |
@@ -3,95 +3,81 @@
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/ */
package bandit; package bandit.Model;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.Flow.Subscriber;
import java.util.concurrent.SubmissionPublisher; import java.util.concurrent.SubmissionPublisher;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger; import java.util.logging.Logger;
import bandit.util.OhmLogger; import bandit.util.OhmLogger;
/** /**
* *
* @author le * @author Schuhmann
*/ */
public class Zahlengenerator implements Runnable // Callable public class Wuerfel implements Runnable // Callable
{ {
private static Logger lg = OhmLogger.getLogger(); //Logger sollten immer static sein da sie für alle instanzen loggs ausführen private static Logger lg = OhmLogger.getLogger(); //Logger sollten immer static sein da sie für alle instanzen loggs ausführen
private WuerfelData data;
private int wert; private volatile boolean laufend;
/** Zustandsvariable !!!
* bei 2 Werten boolean sonst enum
*/
// private volatile boolean laufend;
private AtomicBoolean laufend;
//private Thread thd;
private ExecutorService eService; private ExecutorService eService;
private final Object LOCK; private final Object LOCK;
private SubmissionPublisher<WuerfelData> wertPublisher;
private SubmissionPublisher<Integer> wertPublisher; public Wuerfel(int id)
public Zahlengenerator()
{ {
wert = -1; data = new WuerfelData(id, 0);
//laufend = false; laufend = false;
laufend = new AtomicBoolean(false); eService = null;
//thd = null;
eService = Executors.newSingleThreadExecutor();
wertPublisher = new SubmissionPublisher<>(); wertPublisher = new SubmissionPublisher<>();
LOCK = new Object(); LOCK = new Object();
} }
public void addWertSubscription(Subscriber<Integer> subscriber) public void addWertSubscription(Subscriber<WuerfelData> subscriber)
{ {
wertPublisher.subscribe(subscriber); wertPublisher.subscribe(subscriber);
} }
public void start() public void start()
{ {
//laufend = true; synchronized (this) {
laufend.set(true); laufend = true;
synchronized (LOCK) }
{
LOCK.notify();
}
if (eService == null)
if (eService.isShutdown())
{ {
eService = Executors.newSingleThreadExecutor(); eService = Executors.newSingleThreadExecutor();
eService.execute(this);
}
synchronized (LOCK)
{
LOCK.notifyAll();
} }
eService.execute(this);
//Future task = eService.submit(this); v.a. bei callable
// if (thd == null)
// {
// thd = new Thread(this);
// thd.start();
// }
} }
public void stop() public void stop()
{ {
//laufend = false; synchronized(this){
laufend.set(false); laufend = false;
}
} }
@Override @Override
public void run() public void run()
{ {
lg.fine("Run "+ data.getId());
while (true) while (true)
{ {
//while (!laufend)
while (!laufend.get()) while (!laufend)
{ {
synchronized (LOCK) synchronized (LOCK)
{ {
try try
{ {
lg.info("WAIT"); lg.fine("Stop " + data.getId());
LOCK.wait(); LOCK.wait();
} }
catch (InterruptedException ex) catch (InterruptedException ex)
@@ -109,21 +95,34 @@ public class Zahlengenerator implements Runnable // Callable
{ {
System.err.println(ex); System.err.println(ex);
} }
this.berechneWert();
wertPublisher.submit(wert); if(laufend){
this.berechneWert();
wertPublisher.submit(data);
}
} }
// thd = null;
// eService.shutdown();
} }
/**
* berechnet den Wert für jede itteration
*/
private synchronized void berechneWert() private synchronized void berechneWert()
{ {
wert = (int) (1 + 49*Math.random()); data.setValue((int) (1 + 6*Math.random()));
// if(data.getValue() < 6){
// data.setValue(data.getValue()+1);
// }
// else{
// data.setValue(0);
//
// }
} }
public synchronized int getWert() public synchronized int getValue(){
{ return data.getValue();
return wert;
} }
} }
+44
View File
@@ -0,0 +1,44 @@
/*
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/
package bandit.Model;
/**
*
* @author Js-Sc
*/
public class WuerfelData {
private int id;
private int value;
public WuerfelData(int id, int value){
this.id = id;
this.value = value;
}
/**
* @return the id
*/
public int getId() {
return id;
}
/**
* @return the value
*/
public int getValue() {
return value;
}
/**
* @param value the value to set
*/
public void setValue(int value) {
this.value = value;
}
}
+111
View File
@@ -0,0 +1,111 @@
/*
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/
package bandit.Model;
//import bandit.Model.Generator.Generator2;
//import bandit.Model.Generator.Generator3;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Flow.Subscriber;
import java.util.concurrent.SubmissionPublisher;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import bandit.util.OhmLogger;
import java.util.ArrayList;
import java.util.concurrent.Flow;
/**
*
* @author le
*/
public class Zahlengenerator implements Subscriber<WuerfelData> // Callable
{
private static Logger lg = OhmLogger.getLogger(); //Logger sollten immer static sein da sie für alle instanzen loggs ausführen
private ArrayList<Flow.Subscription> subscriptions;
//private Flow.Subscription subscription;
private SubmissionPublisher<WuerfelData> wertPublisher;
private Wuerfel wuerfel_1;
private Wuerfel wuerfel_2;
private Wuerfel wuerfel_3;
public Zahlengenerator()
{
subscriptions = new ArrayList<>();
wertPublisher = new SubmissionPublisher<>();
wuerfel_1 = new Wuerfel(1);
wuerfel_2 = new Wuerfel(2);
wuerfel_3 = new Wuerfel(3);
synchronized(this){
wuerfel_1.addWertSubscription(this);
wuerfel_2.addWertSubscription(this);
wuerfel_3.addWertSubscription(this);
}
}
public void addWertSubscription(Subscriber<WuerfelData> subscriber)
{
wertPublisher.subscribe(subscriber);
}
public void start()
{
lg.info("Generator gestartet");
wuerfel_1.start();
wuerfel_2.start();
wuerfel_3.start();
}
public void stop()
{
lg.info("Generator gestopt");
wuerfel_1.stop();
wuerfel_2.stop();
wuerfel_3.stop();
int w1_value = wuerfel_1.getValue();
int w2_value = wuerfel_2.getValue();
int w3_value = wuerfel_3.getValue();
if (w1_value == w2_value && w2_value == w3_value){
lg.warning("This user has to much luck, he/she should go to a casino");
}
else
lg.warning("unlucky -> " + w1_value + w2_value + w3_value);
}
@Override
public void onSubscribe(Flow.Subscription subscription) {
lg.config("on subscribe");
this.subscriptions.add(subscription);
subscription.request(1);
}
@Override
public void onNext(WuerfelData item) {
lg.config("on Next");
this.wertPublisher.submit(item);
this.subscriptions.get(item.getId() - 1).request(1);
}
@Override
public void onError(Throwable throwable) {
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
}
@Override
public void onComplete() {
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
}
}
@@ -3,8 +3,10 @@
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/ */
package bandit; package bandit.Schnittstelle;
import bandit.Model.Zahlengenerator;
import bandit.View.ZahlenView;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -37,12 +39,12 @@ public class StartStopController implements ActionListener
{ {
if (evt.getSource() == view.getBtnStart()) if (evt.getSource() == view.getBtnStart())
{ {
lg.info("Start"); lg.info("Start gedruekt");
model.start(); model.start();
} }
else else
{ {
lg.info("Stop"); lg.info("Stop gedrueckt");
model.stop(); model.stop();
} }
} }
@@ -3,17 +3,22 @@
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/ */
package bandit; package bandit.Schnittstelle;
import bandit.Model.WuerfelData;
import bandit.Model.Zahlengenerator;
import bandit.View.ZahlenView;
import java.util.ArrayList;
import java.util.concurrent.Flow; import java.util.concurrent.Flow;
import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.Flow.Subscriber;
import java.util.concurrent.Flow.Subscription; import java.util.concurrent.Flow.Subscription;
import javax.swing.Icon;
/** /**
* *
* @author le * @author le
*/ */
public class WertAdapter implements Subscriber<Integer> public class WertAdapter implements Subscriber<WuerfelData>
{ {
private ZahlenView view; private ZahlenView view;
private Zahlengenerator model; private Zahlengenerator model;
@@ -30,15 +35,28 @@ public class WertAdapter implements Subscriber<Integer>
{ {
this.subscription = subscription; this.subscription = subscription;
this.subscription.request(1); this.subscription.request(1);
//this.subscription.request(Long.MAX_VALUE);
} }
@Override @Override
public void onNext(Integer item) public void onNext(WuerfelData item)
{ {
String strWert = String.valueOf(item); String strWert = String.valueOf(item.getValue());
view.getLblZahl().setText(strWert); switch(item.getId()){
case 1:
view.getLblZahl1().setText(strWert);
break;
case 2:
view.getLblZahl2().setText(strWert);
break;
case 3:
view.getLblZahl3().setText(strWert);
break;
}
this.subscription.request(1); this.subscription.request(1);
} }
@Override @Override
+5
View File
@@ -5,6 +5,10 @@
package bandit; package bandit;
import bandit.View.ZahlenView;
import bandit.Schnittstelle.WertAdapter;
import bandit.Schnittstelle.StartStopController;
import bandit.Model.Zahlengenerator;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.UIManager; import javax.swing.UIManager;
@@ -24,6 +28,7 @@ public class Start
controller.registerEvents(); controller.registerEvents();
model.addWertSubscription(adapter); model.addWertSubscription(adapter);
view.setVisible(true); view.setVisible(true);
view.pack();
} }
@@ -23,20 +23,6 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents> <SubComponents>
<Component class="javax.swing.JLabel" name="lblZahl">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Liberation Sans" size="100" style="0"/>
</Property>
<Property name="horizontalAlignment" type="int" value="0"/>
<Property name="text" type="java.lang.String" value="?"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
</Component>
<Container class="javax.swing.JPanel" name="jPanel1"> <Container class="javax.swing.JPanel" name="jPanel1">
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
@@ -58,5 +44,58 @@
</Component> </Component>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="jPanel2">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="lblZahl1">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Liberation Sans" size="100" style="0"/>
</Property>
<Property name="horizontalAlignment" type="int" value="0"/>
<Property name="text" type="java.lang.String" value="?"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
<LineBorder/>
</Border>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="lblZahl2">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Liberation Sans" size="100" style="0"/>
</Property>
<Property name="horizontalAlignment" type="int" value="0"/>
<Property name="text" type="java.lang.String" value="?"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
<LineBorder/>
</Border>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="lblZahl3">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Liberation Sans" size="100" style="0"/>
</Property>
<Property name="horizontalAlignment" type="int" value="0"/>
<Property name="text" type="java.lang.String" value="?"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
<LineBorder/>
</Border>
</Property>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents> </SubComponents>
</Form> </Form>
@@ -2,7 +2,7 @@
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
* Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template
*/ */
package bandit; package bandit.View;
/** /**
* *
@@ -10,6 +10,27 @@ package bandit;
*/ */
public class ZahlenView extends javax.swing.JFrame public class ZahlenView extends javax.swing.JFrame
{ {
/**
* @return the lblZahl1
*/
public javax.swing.JLabel getLblZahl1() {
return lblZahl1;
}
/**
* @return the lblZahl2
*/
public javax.swing.JLabel getLblZahl2() {
return lblZahl2;
}
/**
* @return the lblZahl3
*/
public javax.swing.JLabel getLblZahl3() {
return lblZahl3;
}
/** /**
* @return the btnStart * @return the btnStart
*/ */
@@ -31,7 +52,7 @@ public class ZahlenView extends javax.swing.JFrame
*/ */
public javax.swing.JLabel getLblZahl() public javax.swing.JLabel getLblZahl()
{ {
return lblZahl; return getLblZahl1();
} }
/** /**
@@ -48,31 +69,50 @@ public class ZahlenView extends javax.swing.JFrame
* regenerated by the Form Editor. * regenerated by the Form Editor.
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents()
{
lblZahl = new javax.swing.JLabel(); jPanel1 = new javax.swing.JPanel();
jPanel1 = new javax.swing.JPanel(); btnStart = new javax.swing.JButton();
btnStart = new javax.swing.JButton(); btnStop = new javax.swing.JButton();
btnStop = new javax.swing.JButton(); jPanel2 = new javax.swing.JPanel();
lblZahl1 = new javax.swing.JLabel();
lblZahl2 = new javax.swing.JLabel();
lblZahl3 = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
lblZahl.setFont(new java.awt.Font("Liberation Sans", 0, 100)); // NOI18N btnStart.setText("Start");
lblZahl.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); jPanel1.add(btnStart);
lblZahl.setText("?");
getContentPane().add(lblZahl, java.awt.BorderLayout.CENTER);
btnStart.setText("Start"); btnStop.setText("Stop");
jPanel1.add(btnStart); jPanel1.add(btnStop);
btnStop.setText("Stop"); getContentPane().add(jPanel1, java.awt.BorderLayout.PAGE_END);
jPanel1.add(btnStop);
getContentPane().add(jPanel1, java.awt.BorderLayout.PAGE_END); lblZahl1.setFont(new java.awt.Font("Liberation Sans", 0, 100)); // NOI18N
lblZahl1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
lblZahl1.setText("?");
lblZahl1.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
jPanel2.add(lblZahl1);
pack(); lblZahl2.setFont(new java.awt.Font("Liberation Sans", 0, 100)); // NOI18N
}// </editor-fold>//GEN-END:initComponents lblZahl2.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
lblZahl2.setText("?");
lblZahl2.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
jPanel2.add(lblZahl2);
lblZahl3.setFont(new java.awt.Font("Liberation Sans", 0, 100)); // NOI18N
lblZahl3.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
lblZahl3.setText("?");
lblZahl3.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
jPanel2.add(lblZahl3);
getContentPane().add(jPanel2, java.awt.BorderLayout.CENTER);
pack();
}// </editor-fold>//GEN-END:initComponents
/** /**
* @param args the command line arguments * @param args the command line arguments
@@ -123,10 +163,13 @@ public class ZahlenView extends javax.swing.JFrame
}); });
} }
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btnStart; private javax.swing.JButton btnStart;
private javax.swing.JButton btnStop; private javax.swing.JButton btnStop;
private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel1;
private javax.swing.JLabel lblZahl; private javax.swing.JPanel jPanel2;
// End of variables declaration//GEN-END:variables private javax.swing.JLabel lblZahl1;
private javax.swing.JLabel lblZahl2;
private javax.swing.JLabel lblZahl3;
// End of variables declaration//GEN-END:variables
} }
+59 -12
View File
@@ -5,50 +5,97 @@
package bandit.util; package bandit.util;
import java.io.IOException;
import java.io.InputStream;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Properties;
import java.util.logging.*; import java.util.logging.*;
/** /**
* * Klasse zur eigens konfigurierten Log-Ausgabe in der Console
* @author le * @author ahrens
*/ */
public class OhmLogger public class OhmLogger
{ {
private static final String LOGGER_NAME = "OhmLogger";
private static Logger lg = null; private static Logger lg = null;
private OhmLogger() //Singelton-Patter -> privater ctor -> anlegen nur über klassenmethode möglich /**
* privater Konstrukter -> Singleton
*/
private OhmLogger()
{ {
} }
/**
* Public Method zum Erstellen des Loggers und zum Aufruf der Methode
* zum Initialisieren
* @return Referenz auf Logger
*/
public static Logger getLogger() public static Logger getLogger()
{ {
if (lg == null) if (lg == null)
{ {
lg = Logger.getLogger("OhmLogger"); lg = Logger.getLogger(LOGGER_NAME);
initLogger(); initLogger();
} }
return lg; return lg;
} }
/**
* Methode zum Initialisieren, Suchen der Konfigurationsdatei, Anlegen eines
* neuen Console Handlers, Löschen der bisherigen Standard Handler und
* Einfügen des eigenen Handler, Setzen des Levels, je nach Properties
*/
private static void initLogger() private static void initLogger()
{ {
// FileHandler fh = new FileHandler(); try (InputStream configFile = OhmLogger.class.getClassLoader().getResourceAsStream("config.properties")) {
ConsoleHandler ch = new ConsoleHandler(); if (configFile != null) {
ch.setFormatter(new OhmFormatter()); Properties properties = new Properties();
lg.addHandler(ch); properties.load(configFile);
java.util.logging.Level classLogLevel = java.util.logging.Level.parse(properties.getProperty("log.level"));
ConsoleHandler ch = new ConsoleHandler();
ch.setFormatter(new OhmFormatter());
lg.setUseParentHandlers(false);
lg.getHandlers();
lg.addHandler(ch);
lg.setLevel(classLogLevel);
String logDirectory = properties.getProperty("log.directory");
String logFileName = properties.getProperty("log.filename");
FileHandler fileHandler = new FileHandler(logDirectory + "/" + logFileName, true);
fileHandler.setFormatter(new OhmFormatter());
lg.addHandler(fileHandler);
} else {
System.err.println("Unable to find config.properties file. OhmLogger will use default settings.");
}
} catch (IOException | SecurityException e) {
System.err.println("Error configuring OhmLogger: " + e.getMessage());
}
} }
} }
class OhmFormatter extends SimpleFormatter /**
* Klasse zum Setzen des Formates des Auszugebenden Log-Strings
* @author ahren
*/
class OhmFormatter extends Formatter
{ {
@Override @Override
public String format(LogRecord record) public String format(LogRecord record)
{ {
String logline = ""; String logline = "| ";
LocalDateTime ldt = LocalDateTime.now(); LocalDateTime ldt = LocalDateTime.now();
logline += ldt.toString(); logline += ldt.toString();
logline += ";" + record.getMessage(); logline += " | " + record.getLevel();
logline += "\n"; logline += " | " + record.getSourceClassName();
logline += " | " + record.getMessage();
logline += " |\n";
return logline; return logline;
} }
+8
View File
@@ -0,0 +1,8 @@
log.level=INFO
log.directory=../Aufgabe7_bandit
log.filename=ohmLog
# Beispiel f\u00fcr verschiedene Level f\u00fcr unterschiedliche Pakete
# log.level.bandit.Zahlengenerator=FINE
# log.level.bandit.Model.Wuerfel=WARNING