3 Commits
13 changed files with 123 additions and 541 deletions
+2
View File
@@ -1 +1,3 @@
/nbproject/private/
/build/
/dist/
-145
View File
@@ -1,145 +0,0 @@
| 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
@@ -1,15 +0,0 @@
| 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 |
-44
View File
@@ -1,44 +0,0 @@
/*
* 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
@@ -1,111 +0,0 @@
/*
* 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
}
}
-5
View File
@@ -5,10 +5,6 @@
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.UIManager;
@@ -28,7 +24,6 @@ public class Start
controller.registerEvents();
model.addWertSubscription(adapter);
view.setVisible(true);
view.pack();
}
@@ -3,10 +3,8 @@
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/
package bandit.Schnittstelle;
package bandit;
import bandit.Model.Zahlengenerator;
import bandit.View.ZahlenView;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.logging.Logger;
@@ -39,12 +37,12 @@ public class StartStopController implements ActionListener
{
if (evt.getSource() == view.getBtnStart())
{
lg.info("Start gedruekt");
lg.info("Start");
model.start();
}
else
{
lg.info("Stop gedrueckt");
lg.info("Stop");
model.stop();
}
}
@@ -3,22 +3,17 @@
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/
package bandit.Schnittstelle;
package bandit;
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.Subscriber;
import java.util.concurrent.Flow.Subscription;
import javax.swing.Icon;
/**
*
* @author le
*/
public class WertAdapter implements Subscriber<WuerfelData>
public class WertAdapter implements Subscriber<Integer>
{
private ZahlenView view;
private Zahlengenerator model;
@@ -35,28 +30,15 @@ public class WertAdapter implements Subscriber<WuerfelData>
{
this.subscription = subscription;
this.subscription.request(1);
//this.subscription.request(Long.MAX_VALUE);
}
@Override
public void onNext(WuerfelData item)
public void onNext(Integer item)
{
String strWert = String.valueOf(item.getValue());
switch(item.getId()){
case 1:
view.getLblZahl1().setText(strWert);
break;
case 2:
view.getLblZahl2().setText(strWert);
break;
case 3:
view.getLblZahl3().setText(strWert);
break;
}
String strWert = String.valueOf(item);
view.getLblZahl().setText(strWert);
this.subscription.request(1);
}
@Override
@@ -23,6 +23,20 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<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">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
@@ -44,58 +58,5 @@
</Component>
</SubComponents>
</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>
</Form>
@@ -2,7 +2,7 @@
* 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
*/
package bandit.View;
package bandit;
/**
*
@@ -10,27 +10,6 @@ package bandit.View;
*/
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
*/
@@ -52,7 +31,7 @@ public class ZahlenView extends javax.swing.JFrame
*/
public javax.swing.JLabel getLblZahl()
{
return getLblZahl1();
return lblZahl;
}
/**
@@ -69,50 +48,31 @@ public class ZahlenView extends javax.swing.JFrame
* regenerated by the Form Editor.
*/
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents()
{
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
jPanel1 = new javax.swing.JPanel();
btnStart = 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();
lblZahl = new javax.swing.JLabel();
jPanel1 = new javax.swing.JPanel();
btnStart = new javax.swing.JButton();
btnStop = new javax.swing.JButton();
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
btnStart.setText("Start");
jPanel1.add(btnStart);
lblZahl.setFont(new java.awt.Font("Liberation Sans", 0, 100)); // NOI18N
lblZahl.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
lblZahl.setText("?");
getContentPane().add(lblZahl, java.awt.BorderLayout.CENTER);
btnStop.setText("Stop");
jPanel1.add(btnStop);
btnStart.setText("Start");
jPanel1.add(btnStart);
getContentPane().add(jPanel1, java.awt.BorderLayout.PAGE_END);
btnStop.setText("Stop");
jPanel1.add(btnStop);
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);
getContentPane().add(jPanel1, java.awt.BorderLayout.PAGE_END);
lblZahl2.setFont(new java.awt.Font("Liberation Sans", 0, 100)); // NOI18N
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
pack();
}// </editor-fold>//GEN-END:initComponents
/**
* @param args the command line arguments
@@ -163,13 +123,10 @@ public class ZahlenView extends javax.swing.JFrame
});
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btnStart;
private javax.swing.JButton btnStop;
private javax.swing.JPanel jPanel1;
private javax.swing.JPanel jPanel2;
private javax.swing.JLabel lblZahl1;
private javax.swing.JLabel lblZahl2;
private javax.swing.JLabel lblZahl3;
// End of variables declaration//GEN-END:variables
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btnStart;
private javax.swing.JButton btnStop;
private javax.swing.JPanel jPanel1;
private javax.swing.JLabel lblZahl;
// End of variables declaration//GEN-END:variables
}
@@ -3,81 +3,95 @@
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/
package bandit.Model;
package bandit;
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;
/**
*
* @author Schuhmann
* @author le
*/
public class Wuerfel implements Runnable // Callable
public class Zahlengenerator implements Runnable // Callable
{
private static Logger lg = OhmLogger.getLogger(); //Logger sollten immer static sein da sie für alle instanzen loggs ausführen
private WuerfelData data;
private volatile boolean laufend;
private ExecutorService eService;
private final Object LOCK;
private SubmissionPublisher<WuerfelData> wertPublisher;
public Wuerfel(int id)
private int wert;
/** Zustandsvariable !!!
* bei 2 Werten boolean sonst enum
*/
// private volatile boolean laufend;
private AtomicBoolean laufend;
//private Thread thd;
private ExecutorService eService;
private final Object LOCK;
private SubmissionPublisher<Integer> wertPublisher;
public Zahlengenerator()
{
data = new WuerfelData(id, 0);
laufend = false;
eService = null;
wert = -1;
//laufend = false;
laufend = new AtomicBoolean(false);
//thd = null;
eService = Executors.newSingleThreadExecutor();
wertPublisher = new SubmissionPublisher<>();
LOCK = new Object();
}
public void addWertSubscription(Subscriber<WuerfelData> subscriber)
public void addWertSubscription(Subscriber<Integer> subscriber)
{
wertPublisher.subscribe(subscriber);
}
public void start()
{
synchronized (this) {
laufend = true;
}
if (eService == null)
{
eService = Executors.newSingleThreadExecutor();
eService.execute(this);
}
//laufend = true;
laufend.set(true);
synchronized (LOCK)
{
LOCK.notifyAll();
LOCK.notify();
}
if (eService.isShutdown())
{
eService = Executors.newSingleThreadExecutor();
}
eService.execute(this);
//Future task = eService.submit(this); v.a. bei callable
// if (thd == null)
// {
// thd = new Thread(this);
// thd.start();
// }
}
public void stop()
{
synchronized(this){
laufend = false;
}
//laufend = false;
laufend.set(false);
}
@Override
public void run()
{
lg.fine("Run "+ data.getId());
while (true)
{
while (!laufend)
//while (!laufend)
while (!laufend.get())
{
synchronized (LOCK)
{
try
{
lg.fine("Stop " + data.getId());
lg.info("WAIT");
LOCK.wait();
}
catch (InterruptedException ex)
@@ -95,34 +109,21 @@ public class Wuerfel implements Runnable // Callable
{
System.err.println(ex);
}
if(laufend){
this.berechneWert();
wertPublisher.submit(data);
}
this.berechneWert();
wertPublisher.submit(wert);
}
// thd = null;
// eService.shutdown();
}
/**
* berechnet den Wert für jede itteration
*/
private synchronized void berechneWert()
{
data.setValue((int) (1 + 6*Math.random()));
// if(data.getValue() < 6){
// data.setValue(data.getValue()+1);
// }
// else{
// data.setValue(0);
//
// }
wert = (int) (1 + 49*Math.random());
}
public synchronized int getValue(){
return data.getValue();
public synchronized int getWert()
{
return wert;
}
}
+14 -11
View File
@@ -8,7 +8,7 @@ package bandit.util;
import java.io.IOException;
import java.io.InputStream;
import java.time.LocalDateTime;
import java.util.Properties;
//import java.util.Properties;
import java.util.logging.*;
/**
@@ -51,23 +51,26 @@ public class OhmLogger
{
try (InputStream configFile = OhmLogger.class.getClassLoader().getResourceAsStream("config.properties")) {
if (configFile != null) {
Properties properties = new Properties();
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");
lg.setLevel(Level.parse(System.getProperty("log.level", "INFO")));
FileHandler fileHandler = new FileHandler(logDirectory + "/" + logFileName, true);
fileHandler.setFormatter(new OhmFormatter());
lg.addHandler(fileHandler);
// Lese spezifische Level für einzelne Klassen aus der Properties-Datei
// Properties properties = new Properties();
// properties.load(configFile);
//
// for (String key : properties.stringPropertyNames()) {
// if (key.startsWith("log.level.")) {
// String className = key.substring("log.level.".length());
// Logger classLogger = Logger.getLogger(className);
// java.util.logging.Level classLogLevel = java.util.logging.Level.parse(properties.getProperty(key));
// classLogger.setLevel(classLogLevel);
// }
// }
} else {
System.err.println("Unable to find config.properties file. OhmLogger will use default settings.");
+1 -3
View File
@@ -1,8 +1,6 @@
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
# log.level.bandit.Zahlengenerator=WARNING