svnno****@sourc*****
svnno****@sourc*****
2009年 2月 12日 (木) 22:25:12 JST
Revision: 2655
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2655
Author: daisuke_m
Date: 2009-02-12 22:25:12 +0900 (Thu, 12 Feb 2009)
Log Message:
-----------
EditPartのメソッド名と衝突したので、CommandListener#getTarget() を getTargetModelにリネーム。 /
coreとspec-core両方にCommandListenerインターフェイスがいたので、core側を削除。
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/EventBrokerTest.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/CommandListener.java
Removed Paths:
-------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandListener.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java 2009-02-11 18:32:45 UTC (rev 2654)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java 2009-02-12 13:25:12 UTC (rev 2655)
@@ -75,6 +75,6 @@
* @return 通知が必要なら{@code true}、不要なら{@code false}
*/
public boolean requireNotification(CommandListener l, JiemamyElement target) {
- return l.getTarget() == target || ReferenceResolverImpl.isChild(l.getTarget(), target);
+ return l.getTargetModel() == target || ReferenceResolverImpl.isChild(l.getTargetModel(), target);
}
}
Deleted: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandListener.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandListener.java 2009-02-11 18:32:45 UTC (rev 2654)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandListener.java 2009-02-12 13:25:12 UTC (rev 2655)
@@ -1,47 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/02/09
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.editcommand;
-
-import org.jiemamy.EventBrokerImpl;
-import org.jiemamy.model.JiemamyElement;
-
-/**
- * コマンドが実行されたイベントの通知を受け取るリスナ。
- *
- * FIXME specに移動した方が良いと思うが、Command(->CommandProcessor)のインターフェース化ができていない。
- *
- * @author shin1ogawa
- */
-public interface CommandListener {
-
- /**
- * 監視対象に変更があった場合に{@link EventBrokerImpl}がCallbackしてくれる。
- *
- * @param command
- */
- void commandProcess(Command command);
-
- /**
- * 監視対象を返す。
- *
- * @return 監視対象の{@link JiemamyElement}
- */
- JiemamyElement getTarget();
-
-}
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/EventBrokerTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/EventBrokerTest.java 2009-02-11 18:32:45 UTC (rev 2654)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/EventBrokerTest.java 2009-02-12 13:25:12 UTC (rev 2655)
@@ -316,7 +316,7 @@
/**
* {@inheritDoc}
*/
- public JiemamyElement getTarget() {
+ public JiemamyElement getTargetModel() {
return target;
}
}
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/CommandListener.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/CommandListener.java 2009-02-11 18:32:45 UTC (rev 2654)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/CommandListener.java 2009-02-12 13:25:12 UTC (rev 2655)
@@ -40,5 +40,5 @@
*
* @return 監視対象の{@link JiemamyElement}
*/
- JiemamyElement getTarget();
+ JiemamyElement getTargetModel();
}