svnno****@sourc*****
svnno****@sourc*****
2008年 9月 17日 (水) 01:06:36 JST
Revision: 1923
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1923
Author: shin1
Date: 2008-09-17 01:06:36 +0900 (Wed, 17 Sep 2008)
Log Message:
-----------
[CORE-74]の解決
SetterInterceptorから消し忘れていたデバッグ用のsysoutを削除。
Modified Paths:
--------------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/SetterInterceptor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/SetterInterceptor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/SetterInterceptor.java 2008-09-15 16:49:54 UTC (rev 1922)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/SetterInterceptor.java 2008-09-16 16:06:36 UTC (rev 1923)
@@ -51,7 +51,6 @@
Field field = declaringClass.getDeclaredField(fieldName);
field.setAccessible(true);
- System.out.println(declaringClass.getName() + "#" + field.getName() + " was changed!");
// Setter実行前の値を取得する。
// Object oldValue = field.get(invocation.getThis());
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java 2008-09-15 16:49:54 UTC (rev 1922)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java 2008-09-16 16:06:36 UTC (rev 1923)
@@ -1,20 +1,16 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/08/01
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/08/01
+ *
* 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.
+ *
+ * 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.core.utils.processor.root;
@@ -52,8 +48,12 @@
public List<T> process(RootModel rootModel) throws RuntimeException {
List<T> nodes = CollectionsUtil.newArrayList();
for (AbstractNodeModel node : rootModel.getNodes()) {
- if (node.getClass().isAssignableFrom(clazz)) {
+ Class<? extends AbstractNodeModel> nodeClass = node.getClass();
+ if (nodeClass.getName().contains("$$") && node.getClass().getSuperclass().isAssignableFrom(clazz)) {
+ // s2containerから取得したComponentの場合は、superClassで評価する。
nodes.add((T) node);
+ } else if (node.getClass().isAssignableFrom(clazz)) {
+ nodes.add((T) node);
}
}
return nodes;