Make BurnSettings to the changelistener thing

diff --git a/src/com/billkuker/rocketry/motorsim/Burn.java b/src/com/billkuker/rocketry/motorsim/Burn.java
index a3c5ee14c13339aa2c5bfb131c81d1fc377093bf..771e715fe03defbe55c6c77a157c8b9e5d1bc632 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Burn.java
+++ b/src/com/billkuker/rocketry/motorsim/Burn.java
@@ -32,6 +32,11 @@ import com.billkuker.rocketry.motorsim.Validating.ValidationException;
 public class Burn {\r
        private static Logger log = Logger.getLogger(Burn.class);\r
        \r
+       private static final BurnSettings settings = new BurnSettings();\r
+       public static final BurnSettings getBurnSettings(){\r
+               return settings;\r
+       }\r
+       \r
        /**\r
         * A class representing all the settigns one can change on a burn\r
         * @author bkuker\r
@@ -93,8 +98,7 @@ public class Burn {
        }\r
        \r
 \r
-       \r
-       public static final BurnSettings settings = new BurnSettings();\r
+\r
        \r
        private Set<BurnProgressListener> bpls = new HashSet<Burn.BurnProgressListener>();\r
        \r

diff --git a/src/com/billkuker/rocketry/motorsim/ChangeListening.aj b/src/com/billkuker/rocketry/motorsim/ChangeListening.aj
index 8eb7de2d791686da144a37ddcd1a422c505b7a7d..0821282d7b17261ba83598dca51336ef5aad3d35 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/ChangeListening.aj
+++ b/src/com/billkuker/rocketry/motorsim/ChangeListening.aj
@@ -28,7 +28,7 @@ public aspect ChangeListening {
                pcs.firePropertyChange(e);
        }
 
-       declare parents: Motor || Grain || Chamber || Nozzle || Fuel implements Subject;
+       declare parents: Motor || Grain || Chamber || Nozzle || Fuel || Burn.BurnSettings implements Subject;
 
        void around(Subject s, Object newVal):
                execution(void Subject+.set*(..)) && target(s) && args(newVal) {