JavaDocs

.gitignore

@@ -1,3 +1 @@
 /nbproject/private/
-/build/
-/dist/

src/bandit/Model/Wuerfel.java

@@ -3,95 +3,81 @@
  * 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.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.HashSet;
+import java.util.Set;
 
 /**
  *
- * @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 int wert;
-  /** Zustandsvariable !!! 
-   *  bei 2 Werten boolean sonst enum 
-   */
-//  private volatile boolean laufend;
-  private AtomicBoolean laufend;
-  //private Thread thd;
+  private WuerfelData data;
+  private volatile boolean laufend;
   private ExecutorService eService;
-  
   private final Object LOCK;
+  private SubmissionPublisher<WuerfelData> wertPublisher;
   
-  private SubmissionPublisher<Integer> wertPublisher;
-  
-  public Zahlengenerator()
+  public Wuerfel(int id)
   {
-    wert = -1;
-    //laufend = false;
-    laufend = new AtomicBoolean(false);
-    //thd = null;
-    eService = Executors.newSingleThreadExecutor();
+    data = new WuerfelData(id, 0);
+    laufend = false;
+    eService = null;
     wertPublisher = new SubmissionPublisher<>();
     LOCK = new Object();
   }
   
-  public void addWertSubscription(Subscriber<Integer> subscriber)
+  public void addWertSubscription(Subscriber<WuerfelData> subscriber)
   {
     wertPublisher.subscribe(subscriber);
   }
   
   public void start()
   {
-    //laufend = true;
-    laufend.set(true);
-    synchronized (LOCK)
-    {
-      LOCK.notify();
-    }
+      synchronized (this) {
+          laufend = true;
+      }
     
-    
-    if (eService.isShutdown())
+    if (eService == null)
     {
       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()
   {
-    //laufend = false;
-    laufend.set(false);
+      synchronized(this){
+        laufend = false;
+      }
   }
 
   @Override
   public void run()
   {
+      lg.fine("Run "+ data.getId());
     while (true)
     {
-      //while (!laufend)
-      while (!laufend.get())
+      while (!laufend)
       {
         synchronized (LOCK)
         {
           try
           {
-            lg.info("WAIT");
+            lg.fine("Stop " + data.getId());
             LOCK.wait();
           }
           catch (InterruptedException ex)
@@ -109,21 +95,34 @@ public class Zahlengenerator implements Runnable // Callable
       {
         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()
   {
-    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()
-  {
-    return wert;
+
+  public synchronized int getValue(){
+    return data.getValue();
   }
   
 }
+
+

src/bandit/Model/WuerfelData.java

@@ -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;
+    
+    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;
+    }
+    
+    
+    
+}

src/bandit/Model/Zahlengenerator.java

@@ -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
+}
+  
+}

src/bandit/Schnittstelle/StartStopController.java

@@ -3,8 +3,10 @@
  * 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.ActionListener;
 import java.util.logging.Logger;
@@ -37,12 +39,12 @@ public class StartStopController implements ActionListener
   {
     if (evt.getSource() == view.getBtnStart())
     {
-      lg.info("Start");
+      lg.info("Start gedruekt");
       model.start();
     }
     else
     {
-      lg.info("Stop");
+      lg.info("Stop gedrueckt");
       model.stop();
     }
   }

src/bandit/Schnittstelle/WertAdapter.java

@@ -3,17 +3,22 @@
  * 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.Subscriber;
 import java.util.concurrent.Flow.Subscription;
+import javax.swing.Icon;
 
 /**
  *
  * @author le
  */
-public class WertAdapter implements Subscriber<Integer>
+public class WertAdapter implements Subscriber<WuerfelData>
 {
   private ZahlenView view;
   private Zahlengenerator model;
@@ -30,15 +35,28 @@ public class WertAdapter implements Subscriber<Integer>
   {
     this.subscription = subscription;
     this.subscription.request(1);
-    //this.subscription.request(Long.MAX_VALUE);
   }
 
   @Override
-  public void onNext(Integer item)
+  public void onNext(WuerfelData item)
   {
-    String strWert = String.valueOf(item);
-    view.getLblZahl().setText(strWert);
+    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;
+        
+    }
+    
+    
     this.subscription.request(1);
+  
   }
 
   @Override

src/bandit/Start.java

@@ -5,6 +5,10 @@
 
 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;
 
@@ -24,6 +28,7 @@ public class Start
     controller.registerEvents();
     model.addWertSubscription(adapter);
     view.setVisible(true);
+    view.pack();
 
   }
 

src/bandit/View/ZahlenView.form

@@ -23,20 +23,6 @@
 
   <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">
@@ -58,5 +44,58 @@
         </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>

src/bandit/View/ZahlenView.java

@@ -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;
+package bandit.View;
 
 /**
  *
@@ -10,6 +10,27 @@ package bandit;
  */
 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
    */
@@ -31,7 +52,7 @@ public class ZahlenView extends javax.swing.JFrame
    */
   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.
    */
   @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()
+  {
 
-        lblZahl = new javax.swing.JLabel();
-        jPanel1 = new javax.swing.JPanel();
-        btnStart = new javax.swing.JButton();
-        btnStop = new javax.swing.JButton();
+    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();
 
-        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
-        lblZahl.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        lblZahl.setText("?");
-        getContentPane().add(lblZahl, java.awt.BorderLayout.CENTER);
+    btnStart.setText("Start");
+    jPanel1.add(btnStart);
 
-        btnStart.setText("Start");
-        jPanel1.add(btnStart);
+    btnStop.setText("Stop");
+    jPanel1.add(btnStop);
 
-        btnStop.setText("Stop");
-        jPanel1.add(btnStop);
+    getContentPane().add(jPanel1, java.awt.BorderLayout.PAGE_END);
 
-        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();
-    }// </editor-fold>//GEN-END:initComponents
+    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
 
   /**
    * @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
-    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
+  // 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
 }

src/bandit/util/OhmLogger.java

@@ -8,6 +8,9 @@ package bandit.util;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 //import java.util.Properties;
 import java.util.logging.*;
 
@@ -57,20 +60,10 @@ public class OhmLogger
         lg.getHandlers();
         lg.addHandler(ch);
         
-        lg.setLevel(Level.parse(System.getProperty("log.level", "INFO")));
-        
-//  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);
-//            }
-//        }
+        Properties properties = new Properties();
+        properties.load(configFile);
+        java.util.logging.Level classLogLevel = java.util.logging.Level.parse(properties.getProperty("log.level"));
+        lg.setLevel(classLogLevel);           
             
       } else {
         System.err.println("Unable to find config.properties file. OhmLogger will use default settings.");
@@ -102,4 +95,4 @@ class OhmFormatter extends Formatter
     
     return logline;
   }
-}
+}

src/config.properties

@@ -1,6 +1,4 @@
 log.level=INFO
-
-
 # Beispiel f\u00fcr verschiedene Level f\u00fcr unterschiedliche Pakete
 # log.level.bandit.Zahlengenerator=FINE
-# log.level.bandit.Zahlengenerator=WARNING
+# log.level.bandit.Model.Wuerfel=WARNING