(no commit message)

[sw/motorsim] / src / com / billkuker / rocketry / motorsim / ChangeListening.aj

diff --git a/src/com/billkuker/rocketry/motorsim/ChangeListening.aj b/src/com/billkuker/rocketry/motorsim/ChangeListening.aj
index 86fc38e013e92ef2c8a6844900da70f5b076af1f..8eb7de2d791686da144a37ddcd1a422c505b7a7d 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/ChangeListening.aj
+++ b/src/com/billkuker/rocketry/motorsim/ChangeListening.aj
@@ -5,12 +5,11 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.lang.reflect.Method;
 
-import javax.swing.event.ChangeListener;
-
-import com.billkuker.rocketry.motorsim.grain.MultiGrain;
+import org.apache.log4j.Logger;
 
 public aspect ChangeListening {
 
+       private static Logger log = Logger.getLogger(ChangeListening.class);
        public interface Subject {
                // public void addPropertyChangeListener(PropertyChangeListener l);
        }
@@ -18,13 +17,11 @@ public aspect ChangeListening {
        private PropertyChangeSupport Subject.pcs;
 
        public void Subject.addPropertyChangeListener(PropertyChangeListener l) {
-               //System.out.println("PCS Added");
                pcs.addPropertyChangeListener(l);
        }
        
        public void Subject.removePropertyChangeListener(PropertyChangeListener l) {
-               //System.out.println("PCS Removed");
-               pcs.addPropertyChangeListener(l);
+               pcs.removePropertyChangeListener(l);
        }
        
        public void Subject.firePropertyChange(PropertyChangeEvent e) {
@@ -35,7 +32,6 @@ public aspect ChangeListening {
 
        void around(Subject s, Object newVal):
                execution(void Subject+.set*(..)) && target(s) && args(newVal) {
-               System.out.println(s);
                String name = thisJoinPointStaticPart.getSignature().getName();
                name = name.replaceFirst("set", "");
                Object old = null;
@@ -47,12 +43,10 @@ public aspect ChangeListening {
                        old = m.invoke(s);
 
                } catch (Throwable t) {
-                       System.err.print("Error getting old value for " + name);
+                       log.warn("Error getting old value for " + name);
                }
                proceed(s, newVal);
                if (old != newVal) {
-                       System.out.println(name + " changed from " + old + " to "
-                                       + newVal);
                        s.pcs.firePropertyChange(name, old, newVal);
                }
        }