* fixed #10 remove JApplet and integrate SimulatedEvolutionApplet into SimulatedEvolutionTab extends JFrame

* fixed #12 add application properties as Java and yml File

Author: thomaswoehlke

src/main/java/org/woehlke/computer/kurzweil/dla/control/ControllerThread.java

@@ -1,6 +1,7 @@
 package org.woehlke.computer.kurzweil.dla.control;
 
 import org.woehlke.computer.kurzweil.dla.model.DiffusionLimitedAggregationModel;
+import org.woehlke.computer.kurzweil.dla.view.DiffusionLimitedAggregationFrame;
 import org.woehlke.computer.kurzweil.dla.view.canvas.WorldCanvas;
 
 import java.io.Serializable;
@@ -23,15 +24,21 @@ public class ControllerThread extends Thread
 
     static final long serialVersionUID = 242L;
 
+    private final DiffusionLimitedAggregationFrame tab;
+
     private volatile DiffusionLimitedAggregationModel model;
     private volatile WorldCanvas canvas;
 
+    private final int threadSleepTime;
+
     private Boolean goOn;
 
-    public ControllerThread(WorldCanvas canvas, DiffusionLimitedAggregationModel model) {
+    public ControllerThread(DiffusionLimitedAggregationFrame tab) {
+        this.tab = tab;
         this.goOn = Boolean.TRUE;
-        this.canvas = canvas;
-        this.model = model;
+        this.canvas = this.tab.getCanvas();
+        this.model = this.tab.getModel();
+        this.threadSleepTime = model.getConfig().getDla().getControl().getThreadSleepTime();
     }
 
     public void run() {
@@ -40,9 +47,10 @@ public void run() {
             synchronized (goOn) {
                 doIt = goOn.booleanValue();
             }
-            model.move();
-            canvas.repaint();
-            try { sleep(model.getConfig().getDla().getControl().getThreadSleepTime()); }
+            this.model.move();
+            this.canvas.repaint();
+            this.tab.repaint();
+            try { sleep(this.threadSleepTime); }
             catch (InterruptedException e) { e.printStackTrace(); }
         }
         while (doIt);

src/main/java/org/woehlke/computer/kurzweil/dla/model/DiffusionLimitedAggregationModel.java

@@ -29,17 +29,17 @@ public class DiffusionLimitedAggregationModel implements Serializable {
     static final long serialVersionUID = 242L;
 
     @Getter
-    private ComputerKurzweilProperties config;
+    private final ComputerKurzweilProperties config;
 
     @Getter
-    private Point worldDimensions;
+    private final Point worldDimensions;
 
     @Getter
-    private List<Point> particles = new ArrayList<Point>();
+    private volatile List<Point> particles = new ArrayList<Point>();
 
-    private Random random;
+    private volatile Random random;
 
-    private Dendrite dendrite;
+    private volatile Dendrite dendrite;
 
     public DiffusionLimitedAggregationModel(ComputerKurzweilProperties config) {
         this.config = config;

src/main/java/org/woehlke/computer/kurzweil/dla/view/DiffusionLimitedAggregationFrame.java

@@ -1,5 +1,6 @@
 package org.woehlke.computer.kurzweil.dla.view;
 
+import lombok.Getter;
 import org.woehlke.computer.kurzweil.dla.config.ComputerKurzweilProperties;
 import org.woehlke.computer.kurzweil.dla.control.ControllerThread;
 import org.woehlke.computer.kurzweil.dla.model.DiffusionLimitedAggregationModel;
@@ -29,6 +30,7 @@
  * Date: 04.02.2006
  * Time: 18:47:46
  */
+@Getter
 public class DiffusionLimitedAggregationFrame extends JFrame implements ImageObserver,
         MenuContainer,
         Serializable,
@@ -51,7 +53,7 @@ public DiffusionLimitedAggregationFrame(ComputerKurzweilProperties config) {
         this.copyright = new JLabel(config.getDla().getView().getCopyright(),CENTER);
         this.model = new DiffusionLimitedAggregationModel(config);
         this.canvas = new WorldCanvas(model);
-        this.controller = new ControllerThread(canvas, model);
+        this.controller = new ControllerThread(this);
         this.setLayout(new BorderLayout());
         this.add(subtitle, BorderLayout.NORTH);
         this.add(canvas, BorderLayout.CENTER);

src/main/java/org/woehlke/computer/kurzweil/dla/view/canvas/WorldCanvas.java

@@ -40,6 +40,7 @@ public WorldCanvas( DiffusionLimitedAggregationModel model) {
         this.worldDimensions = model.getWorldDimensions();
         this.setBackground(MEDIUM);
         this.setSize(this.worldDimensions.getX(), this.worldDimensions.getY());
+        this.setVisible(true);
     }
 
     public void paint(Graphics g) {