svnno****@sourc*****
svnno****@sourc*****
2008年 10月 7日 (火) 00:03:00 JST
Revision: 2001
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=2001
Author: shin1
Date: 2008-10-07 00:03:00 +0900 (Tue, 07 Oct 2008)
Log Message:
-----------
AbstractObservable#fireChange()内で、イベント発生元がモデルではなくObservable自身となっていた。
Modified Paths:
--------------
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/AbstractObservable.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/SetterInterceptor.java
zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/ModelChangeEvent.java
zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/Observable.java
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/AbstractObservable.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/AbstractObservable.java 2008-10-06 14:24:47 UTC (rev 2000)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/AbstractObservable.java 2008-10-06 15:03:00 UTC (rev 2001)
@@ -55,8 +55,8 @@
/**
* {@inheritDoc}
*/
- public void fireModelChange(Field field) {
- ModelChangeEvent e = new ModelChangeEvent(this, field);
+ public void fireModelChange(Object model, Field field) {
+ ModelChangeEvent e = new ModelChangeEvent(model, field);
for (ModelChangeListener listener : listeners) {
listener.modelChanged(e);
}
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/SetterInterceptor.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/SetterInterceptor.java 2008-10-06 14:24:47 UTC (rev 2000)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/SetterInterceptor.java 2008-10-06 15:03:00 UTC (rev 2001)
@@ -66,7 +66,7 @@
// Object newValue = field.get(invocation.getThis());
// Eventを発火する。
- ((Adaptable) target).getAdapter(Observable.class).fireModelChange(field);
+ ((Adaptable) target).getAdapter(Observable.class).fireModelChange(target, field);
return result;
}
Modified: zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/ModelChangeEvent.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/ModelChangeEvent.java 2008-10-06 14:24:47 UTC (rev 2000)
+++ zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/ModelChangeEvent.java 2008-10-06 15:03:00 UTC (rev 2001)
@@ -48,7 +48,7 @@
* @param field 変更されたフィールド
* @category instance creation
*/
- public ModelChangeEvent(Observable source, Field field) {
+ public ModelChangeEvent(Object source, Field field) {
super(source);
this.field = field;
}
Modified: zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/Observable.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/Observable.java 2008-10-06 14:24:47 UTC (rev 2000)
+++ zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/Observable.java 2008-10-06 15:03:00 UTC (rev 2001)
@@ -33,9 +33,10 @@
/**
* リスナーにモデルの変更を通知する。
+ * @param model 対象のモデル
* @param field 変更されたフィールド
*/
- void fireModelChange(Field field);
+ void fireModelChange(Object model, Field field);
/**
* モデルの変更リスナーを削除する。