Draft2

src/bandit/Model/Generator/Generator1.java → src/bandit/Model/Wuerfel.java

@@ -3,7 +3,7 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
 
-package bandit.Model.Generator;
+package bandit.Model;
 
 import bandit.Model.Zahlengenerator;
 import java.util.concurrent.ExecutorService;
@@ -18,7 +18,7 @@ import bandit.util.OhmLogger;
  *
  * @author le
  */
-public class Generator1 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
   
@@ -30,7 +30,7 @@ public class Generator1 implements Runnable // Callable
   
   private SubmissionPublisher<Integer> wertPublisher;
   
-  public Generator1(Zahlengenerator hauptgenerator)
+  public Wuerfel(Zahlengenerator hauptgenerator)
   {
     wert = 0;
 

src/bandit/Model/Zahlengenerator.java

@@ -5,7 +5,6 @@
 
 package bandit.Model;
 
-import bandit.Model.Generator.Generator1;
 //import bandit.Model.Generator.Generator2;
 //import bandit.Model.Generator.Generator3;
 import java.util.concurrent.ExecutorService;
@@ -28,7 +27,7 @@ public class Zahlengenerator implements Subscriber<Integer> // Callable
   private Flow.Subscription subscription;
   private SubmissionPublisher<Integer> wertPublisher;
 
-  private Generator1 generator1;
+  private Wuerfel generator1;
   private Thread thd1;
   
 //  private Generator2 generator2;
@@ -41,7 +40,7 @@ public class Zahlengenerator implements Subscriber<Integer> // Callable
   public Zahlengenerator()
   {
       wertPublisher = new SubmissionPublisher<>();
-      generator1 = new Generator1(this);
+      generator1 = new Wuerfel(this);
 //      generator2 = new Generator2(this);
 //      generator3 = new Generator3(this);