[Jiemamy-notify] commit [1981] event系の型をJ-coreからJ-eventに移動。

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2008年 10月 2日 (木) 20:32:45 JST


Revision: 1981
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1981
Author:   daisuke_m
Date:     2008-10-02 20:32:44 +0900 (Thu, 02 Oct 2008)

Log Message:
-----------
event系の型をJ-coreからJ-eventに移動。

Modified Paths:
--------------
    artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/S2FactoryStrategy.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/RootModelImplTest.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GenerateEntityNameProcessorTest.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java
    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
    artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java
    artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/AbstractSerializeConstraintModel.java
    artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessorTest.java
    artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessorTest.java
    artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessorTest.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java
    zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF

Added Paths:
-----------
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/creator/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/creator/CreateNewModelProcessor.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/creator/
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/creator/FactoryStrategy.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/creator/JiemamyModelFactory.java
    zeus/trunk/org.jiemamy.spec.event/src/main/java/ModelChangeEvent.java
    zeus/trunk/org.jiemamy.spec.event/src/main/java/ModelChangeListener.java
    zeus/trunk/org.jiemamy.spec.event/src/main/java/Observable.java

Removed Paths:
-------------
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/CreateNewModelProcessor.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/core/
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/FactoryStrategy.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/JiemamyModelFactory.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/ModelChangeEvent.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/ModelChangeListener.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/Observable.java


-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -33,7 +33,7 @@
 
 import org.jiemamy.core.S2FactoryStrategy;
 import org.jiemamy.core.extension.composer.ImportContextImpl;
-import org.jiemamy.spec.JiemamyModelFactory;
+import org.jiemamy.creator.JiemamyModelFactory;
 import org.jiemamy.spec.extension.composer.ImportContext;
 import org.jiemamy.spec.extension.composer.Importer;
 import org.jiemamy.spec.extension.dialect.Dialect;

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/S2FactoryStrategy.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/S2FactoryStrategy.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/S2FactoryStrategy.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -21,7 +21,7 @@
 import org.seasar.framework.container.S2Container;
 import org.seasar.framework.container.factory.SingletonS2ContainerFactory;
 
-import org.jiemamy.spec.FactoryStrategy;
+import org.jiemamy.creator.FactoryStrategy;
 import org.jiemamy.spec.exception.JiemamyRuntimeException;
 
 /**

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -23,11 +23,11 @@
 import org.seasar.framework.container.annotation.tiger.Binding;
 
 import org.jiemamy.core.utils.processor.connection.foreignkey.ProvideForeignKeyNameProcessor;
-import org.jiemamy.core.utils.processor.root.CreateNewModelProcessor;
 import org.jiemamy.core.utils.processor.root.GetConnectionsProcessor;
 import org.jiemamy.core.utils.processor.root.GetEntityProcessor;
 import org.jiemamy.core.utils.processor.root.GetNodesProcessor;
 import org.jiemamy.core.utils.processor.root.ProvideEntityNameProcessor;
+import org.jiemamy.creator.CreateNewModelProcessor;
 import org.jiemamy.spec.exception.CannotAppendException;
 import org.jiemamy.spec.exception.TooManyElementsException;
 import org.jiemamy.spec.extension.dialect.IdentifierValidator;

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/CreateNewModelProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/CreateNewModelProcessor.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/CreateNewModelProcessor.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -1,59 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/09/30
- *
- * 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.core.utils.processor.root;
-
-import org.jiemamy.spec.JiemamyModelFactory;
-import org.jiemamy.spec.exception.JiemamyRuntimeException;
-import org.jiemamy.spec.model.JiemamyModel;
-import org.jiemamy.spec.model.RootModel;
-import org.jiemamy.spec.util.Processor;
-
-/**
- * TODO for daisuke
- * @param <T> 
- * @author daisuke
- */
-public class CreateNewModelProcessor<T extends JiemamyModel> implements Processor<RootModel, T, RuntimeException> {
-	
-	private Class<?> clazz;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @param rootModel
-	 * @param clazz
-	 * @category instance creation
-	 */
-	public CreateNewModelProcessor(RootModel rootModel, Class<T> clazz) {
-		this.clazz = clazz;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@SuppressWarnings("unchecked")
-	public T process(RootModel target) {
-		try {
-			
-			return (T) JiemamyModelFactory.getInstance(clazz);
-		} catch (Exception e) {
-			throw new JiemamyRuntimeException(e);
-		}
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/creator/CreateNewModelProcessor.java (from rev 1980, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/CreateNewModelProcessor.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/creator/CreateNewModelProcessor.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/creator/CreateNewModelProcessor.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/30
+ *
+ * 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.creator;
+
+import org.jiemamy.creator.JiemamyModelFactory;
+import org.jiemamy.spec.exception.JiemamyRuntimeException;
+import org.jiemamy.spec.model.JiemamyModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.util.Processor;
+
+/**
+ * TODO for daisuke
+ * @param <T> 
+ * @author daisuke
+ */
+public class CreateNewModelProcessor<T extends JiemamyModel> implements Processor<RootModel, T, RuntimeException> {
+	
+	private Class<?> clazz;
+	
+
+	/**
+	 * コンストラクタ。
+	 * @param rootModel
+	 * @param clazz
+	 * @category instance creation
+	 */
+	public CreateNewModelProcessor(RootModel rootModel, Class<T> clazz) {
+		this.clazz = clazz;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@SuppressWarnings("unchecked")
+	public T process(RootModel target) {
+		try {
+			
+			return (T) JiemamyModelFactory.create(clazz);
+		} catch (Exception e) {
+			throw new JiemamyRuntimeException(e);
+		}
+	}
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/creator/CreateNewModelProcessor.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/RootModelImplTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/RootModelImplTest.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/RootModelImplTest.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -28,7 +28,7 @@
 import org.junit.Test;
 
 import org.jiemamy.core.S2FactoryStrategy;
-import org.jiemamy.spec.JiemamyModelFactory;
+import org.jiemamy.creator.JiemamyModelFactory;
 import org.jiemamy.spec.model.RootModel;
 
 /**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -22,7 +22,7 @@
 import org.junit.Before;
 
 import org.jiemamy.core.S2FactoryStrategy;
-import org.jiemamy.spec.JiemamyModelFactory;
+import org.jiemamy.creator.JiemamyModelFactory;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.connection.ForeignKeyModel;
 import org.jiemamy.spec.model.node.TableModel;

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GenerateEntityNameProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GenerateEntityNameProcessorTest.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GenerateEntityNameProcessorTest.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -28,7 +28,7 @@
 import org.seasar.framework.unit.Seasar2;
 
 import org.jiemamy.core.S2FactoryStrategy;
-import org.jiemamy.spec.JiemamyModelFactory;
+import org.jiemamy.creator.JiemamyModelFactory;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.TableModel;
 import org.jiemamy.spec.model.node.ViewModel;

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -28,7 +28,7 @@
 import org.seasar.framework.unit.Seasar2;
 
 import org.jiemamy.core.S2FactoryStrategy;
-import org.jiemamy.spec.JiemamyModelFactory;
+import org.jiemamy.creator.JiemamyModelFactory;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.TableModel;
 import org.jiemamy.spec.model.node.ViewModel;

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-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/AbstractObservable.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -17,11 +17,12 @@
 import java.lang.reflect.Field;
 import java.util.List;
 
+import org.seasar.framework.container.annotation.tiger.Binding;
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.spec.util.ModelChangeEvent;
-import org.jiemamy.spec.util.ModelChangeListener;
-import org.jiemamy.spec.util.Observable;
+import org.jiemamy.spec.event.ModelChangeEvent;
+import org.jiemamy.spec.event.ModelChangeListener;
+import org.jiemamy.spec.event.Observable;
 
 /**
  * {@link Observable}の全てのinterfaceを実装した抽象Class。
@@ -32,6 +33,7 @@
 public abstract class AbstractObservable implements Observable {
 	
 	/** 変更イベントリスナ */
+	@Binding("list")
 	private transient List<ModelChangeListener> listeners = CollectionsUtil.newArrayList();
 	
 

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-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/SetterInterceptor.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -21,7 +21,7 @@
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
-import org.jiemamy.spec.util.Observable;
+import org.jiemamy.spec.event.Observable;
 
 /**
  * {@link org.jiemamy.core.model.AbstractModel}のSetterをInterceptし、Setter動作後に

Modified: artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -33,13 +33,13 @@
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
 import org.jiemamy.core.S2FactoryStrategy;
+import org.jiemamy.creator.JiemamyModelFactory;
 import org.jiemamy.event.SetterInterceptor;
-import org.jiemamy.spec.JiemamyModelFactory;
+import org.jiemamy.spec.event.ModelChangeEvent;
+import org.jiemamy.spec.event.ModelChangeListener;
+import org.jiemamy.spec.event.Observable;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.TableModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
-import org.jiemamy.spec.util.ModelChangeListener;
-import org.jiemamy.spec.util.Observable;
 
 /**
  * {@link SetterInterceptor}のテストクラス。
@@ -75,8 +75,8 @@
 	@Before
 	public void setUp() {
 		JiemamyModelFactory.init(new S2FactoryStrategy("jiemamy-event.dicon"));
-		
-		tableModel = (TableModel) s2container.getComponent(TableModel.class);
+		RootModel rootModel = JiemamyModelFactory.createRoot();
+		tableModel = rootModel.createJiemamyModel(TableModel.class).init("T_USER");
 		listener = (new ModelChangeListenerImpl());
 		tableModel.getAdapter(Observable.class).addModelChangeListener(listener);
 	}

Modified: artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -37,7 +37,7 @@
 import org.jiemamy.core.model.typedef.datatype.impl.IntegerDataTypeMock;
 import org.jiemamy.core.model.typedef.datatype.impl.TimestampDataTypeMock;
 import org.jiemamy.core.model.typedef.datatype.impl.VarcharDataTypeMock;
-import org.jiemamy.spec.JiemamyModelFactory;
+import org.jiemamy.creator.JiemamyModelFactory;
 import org.jiemamy.spec.event.ObservableCollectionChangeEvent;
 import org.jiemamy.spec.event.ObservableCollectionChangeListener;
 import org.jiemamy.spec.event.ObservableCollectionChangeEvent.Timing;

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -18,14 +18,12 @@
  */
 package org.jiemamy.serializer.model.typedef;
 
-import java.lang.reflect.Field;
 import java.util.List;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 import org.jiemamy.spec.model.JiemamyModel;
 import org.jiemamy.spec.model.datatype.DataType;
-import org.jiemamy.spec.util.ModelChangeListener;
 import org.jiemamy.spec.util.Processor;
 
 /**
@@ -40,14 +38,6 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	public void addModelChangeListener(ModelChangeListener listener) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
 	public void dispose() {
 		// TODO Auto-generated method stub
 		
@@ -56,14 +46,6 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	public void fireModelChange(Field field) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
 	public <T>T getAdapter(Class<T> adapter) {
 		// TODO Auto-generated method stub
 		return null;
@@ -101,12 +83,4 @@
 		return null;
 	}
 	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void removeModelChangeListener(ModelChangeListener listener) {
-		// TODO Auto-generated method stub
-		
-	}
-	
 }

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/AbstractSerializeConstraintModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/AbstractSerializeConstraintModel.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/AbstractSerializeConstraintModel.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -18,14 +18,12 @@
  */
 package org.jiemamy.serializer.model.typedef.constraint;
 
-import java.lang.reflect.Field;
 import java.util.List;
 
 import org.jiemamy.core.model.constraint.AbstractConstraintModel;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
 import org.jiemamy.spec.model.JiemamyModel;
 import org.jiemamy.spec.model.constraint.Constraint;
-import org.jiemamy.spec.util.ModelChangeListener;
 import org.jiemamy.spec.util.Processor;
 
 /**
@@ -43,14 +41,6 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	public void addModelChangeListener(ModelChangeListener listener) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
 	public void dispose() {
 		// TODO Auto-generated method stub
 		
@@ -59,14 +49,6 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	public void fireModelChange(Field field) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
 	public <T>T getAdapter(Class<T> adapter) {
 		// TODO Auto-generated method stub
 		return null;
@@ -105,14 +87,6 @@
 	}
 	
 	/**
-	 * {@inheritDoc}
-	 */
-	public void removeModelChangeListener(ModelChangeListener listener) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	/**
 	 * 制約名を設定する。
 	 * @param name 制約名
 	 */

Modified: artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessorTest.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessorTest.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -30,7 +30,7 @@
 
 import org.jiemamy.core.MustBeMulti;
 import org.jiemamy.core.S2FactoryStrategy;
-import org.jiemamy.spec.JiemamyModelFactory;
+import org.jiemamy.creator.JiemamyModelFactory;
 import org.jiemamy.spec.geometory.JmPoint;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.connection.ForeignKeyModel;

Modified: artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessorTest.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessorTest.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -28,7 +28,7 @@
 
 import org.jiemamy.core.MustBeMulti;
 import org.jiemamy.core.S2FactoryStrategy;
-import org.jiemamy.spec.JiemamyModelFactory;
+import org.jiemamy.creator.JiemamyModelFactory;
 import org.jiemamy.spec.geometory.JmColor;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.TableModel;

Modified: artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessorTest.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessorTest.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -30,7 +30,7 @@
 
 import org.jiemamy.core.MustBeMulti;
 import org.jiemamy.core.S2FactoryStrategy;
-import org.jiemamy.spec.JiemamyModelFactory;
+import org.jiemamy.creator.JiemamyModelFactory;
 import org.jiemamy.spec.geometory.JmRectangle;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.TableModel;

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -20,8 +20,8 @@
 
 import org.eclipse.gef.tools.DirectEditManager;
 
+import org.jiemamy.spec.event.ModelChangeEvent;
 import org.jiemamy.spec.model.node.AbstractEntityModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * {@link AbstractEntityModel}に対するDiagram用EditPart(コントローラ)の抽象クラス。

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -42,6 +42,9 @@
 import org.jiemamy.eclipse.editor.editpolicy.JmDirectEditPolicy;
 import org.jiemamy.eclipse.editor.editpolicy.JmGraphicalNodeEditPolicy;
 import org.jiemamy.eclipse.utils.EditorUtil;
+import org.jiemamy.spec.event.ModelChangeEvent;
+import org.jiemamy.spec.event.ModelChangeListener;
+import org.jiemamy.spec.event.Observable;
 import org.jiemamy.spec.event.ObservableCollectionChangeEvent;
 import org.jiemamy.spec.event.ObservableCollectionChangeListener;
 import org.jiemamy.spec.event.ObservableCollectionChangeEvent.Timing;
@@ -49,9 +52,6 @@
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.connection.AbstractConnectionModel;
 import org.jiemamy.spec.model.node.AbstractNodeModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
-import org.jiemamy.spec.util.ModelChangeListener;
-import org.jiemamy.spec.util.Observable;
 
 /**
  * {@link AbstractNode}に対するDiagram用EditPart(コントローラ)の抽象クラス。

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -30,12 +30,12 @@
 import org.jiemamy.core.MustBeMulti;
 import org.jiemamy.eclipse.editor.editpolicy.JmBendpointEditPolicy;
 import org.jiemamy.eclipse.editor.editpolicy.JmRelationEditPolicy;
+import org.jiemamy.spec.event.ModelChangeEvent;
+import org.jiemamy.spec.event.ModelChangeListener;
+import org.jiemamy.spec.event.Observable;
 import org.jiemamy.spec.geometory.JmPoint;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.connection.AbstractRelationModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
-import org.jiemamy.spec.util.ModelChangeListener;
-import org.jiemamy.spec.util.Observable;
 import org.jiemamy.spec.view.DiagramPresentations;
 
 /**

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -26,11 +26,11 @@
 import org.eclipse.ui.IFileEditorInput;
 
 import org.jiemamy.eclipse.utils.EditorUtil;
+import org.jiemamy.spec.event.ModelChangeListener;
+import org.jiemamy.spec.event.Observable;
 import org.jiemamy.spec.event.ObservableCollectionChangeListener;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.AbstractNodeModel;
-import org.jiemamy.spec.util.ModelChangeListener;
-import org.jiemamy.spec.util.Observable;
 
 /**
  * {@link RootModel}に対するDiagram用EditPart(コントローラ)の抽象クラス。

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -34,10 +34,10 @@
 import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
 import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
 import org.jiemamy.eclipse.preference.JiemamyPreference;
+import org.jiemamy.spec.event.ModelChangeEvent;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.connection.ForeignKeyMapping;
 import org.jiemamy.spec.model.connection.ForeignKeyModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * 外部キーモデルに対するDiagram用EditPart(コントローラ)。

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -41,13 +41,13 @@
 import org.jiemamy.eclipse.editor.editpolicy.JmXYLayoutEditPolicy;
 import org.jiemamy.eclipse.preference.ConnectionRouters;
 import org.jiemamy.eclipse.preference.JiemamyPreference;
+import org.jiemamy.spec.event.ModelChangeEvent;
+import org.jiemamy.spec.event.ModelChangeListener;
+import org.jiemamy.spec.event.Observable;
 import org.jiemamy.spec.event.ObservableCollectionChangeEvent;
 import org.jiemamy.spec.event.ObservableCollectionChangeEvent.Timing;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.AbstractNodeModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
-import org.jiemamy.spec.util.ModelChangeListener;
-import org.jiemamy.spec.util.Observable;
 
 /**
  * {@link RootModel}に対するDiagram用EditPart。

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -31,11 +31,11 @@
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.figure.StickyFigure;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.event.ModelChangeEvent;
 import org.jiemamy.spec.geometory.JmColor;
 import org.jiemamy.spec.geometory.JmRectangle;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.StickyModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
 import org.jiemamy.spec.view.DiagramPresentations;
 
 /**

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -36,6 +36,7 @@
 import org.jiemamy.eclipse.editor.figure.ColumnFigure;
 import org.jiemamy.eclipse.editor.figure.TableFigure;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.event.ModelChangeEvent;
 import org.jiemamy.spec.geometory.JmColor;
 import org.jiemamy.spec.geometory.JmRectangle;
 import org.jiemamy.spec.model.ColumnModel;
@@ -44,7 +45,6 @@
 import org.jiemamy.spec.model.node.AbstractEntityModel;
 import org.jiemamy.spec.model.node.TableModel;
 import org.jiemamy.spec.model.presentation.DiagramPresentationModel.DisplayItem;
-import org.jiemamy.spec.util.ModelChangeEvent;
 import org.jiemamy.spec.view.DiagramPresentations;
 
 /**

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -34,12 +34,12 @@
 import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
 import org.jiemamy.eclipse.editor.figure.ViewFigure;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.event.ModelChangeEvent;
 import org.jiemamy.spec.geometory.JmColor;
 import org.jiemamy.spec.geometory.JmRectangle;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.AbstractEntityModel;
 import org.jiemamy.spec.model.node.ViewModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
 import org.jiemamy.spec.view.DiagramPresentations;
 
 /**

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.eclipse.editor.editpart.outlinetree;
 
+import org.jiemamy.spec.event.ModelChangeEvent;
+import org.jiemamy.spec.event.Observable;
 import org.jiemamy.spec.model.connection.AbstractConnectionModel;
 import org.jiemamy.spec.model.node.AbstractEntityModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
-import org.jiemamy.spec.util.Observable;
 
 /**
  * {@link AbstractEntityModel}に対するTree用EditPart(コントローラ)の抽象クラス。

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -22,10 +22,10 @@
 
 import org.jiemamy.core.model.AbstractModel;
 import org.jiemamy.event.AbstractObservable;
+import org.jiemamy.spec.event.ModelChangeEvent;
+import org.jiemamy.spec.event.ModelChangeListener;
+import org.jiemamy.spec.event.Observable;
 import org.jiemamy.spec.model.RootModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
-import org.jiemamy.spec.util.ModelChangeListener;
-import org.jiemamy.spec.util.Observable;
 
 /**
  * {@link AbstractModel}に対するTree用EditPart(コントローラ)の抽象クラス。

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.eclipse.editor.editpart.outlinetree;
 
+import org.jiemamy.spec.event.Observable;
 import org.jiemamy.spec.model.connection.AbstractRelationModel;
-import org.jiemamy.spec.util.Observable;
 
 /**
  * {@link AbstractRelationModel}に対するTree用EditPart(コントローラ)の抽象クラス。

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -23,11 +23,11 @@
 import org.jiemamy.core.model.connection.InheritanceModel;
 import org.jiemamy.eclipse.Images;
 import org.jiemamy.eclipse.JiemamyPlugin;
+import org.jiemamy.spec.event.ModelChangeEvent;
 import org.jiemamy.spec.model.connection.AbstractRelationModel;
 import org.jiemamy.spec.model.connection.ForeignKeyModel;
 import org.jiemamy.spec.model.node.AbstractEntityModel;
 import org.jiemamy.spec.model.node.TableModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * {@link ForeignKeyModel}に対するTree用EditPart(コントローラ)。

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -22,12 +22,12 @@
 import java.util.List;
 
 import org.jiemamy.eclipse.editor.ModelContainer;
+import org.jiemamy.spec.event.ModelChangeEvent;
 import org.jiemamy.spec.model.DomainModel;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.AbstractNodeModel;
 import org.jiemamy.spec.model.node.TableModel;
 import org.jiemamy.spec.model.node.ViewModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * RootModelに対するTree用EditPart

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -32,10 +32,10 @@
 import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
 import org.jiemamy.eclipse.editor.editpolicy.JmTreeComponentEditPolicy;
 import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
+import org.jiemamy.spec.event.ModelChangeEvent;
 import org.jiemamy.spec.model.JiemamyModel;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.TableModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * {@link TableModel}に対するTree用EditPart(コントローラ)。

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -24,8 +24,8 @@
 import org.jiemamy.eclipse.Images;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.editpolicy.JmTreeComponentEditPolicy;
+import org.jiemamy.spec.event.ModelChangeEvent;
 import org.jiemamy.spec.model.RootModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * DefinitionModelに対するTree用EditPart

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -29,9 +29,9 @@
 import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
 import org.jiemamy.eclipse.editor.editpolicy.JmTreeComponentEditPolicy;
 import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
+import org.jiemamy.spec.event.ModelChangeEvent;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.ViewModel;
-import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * ViewModelに対するTree用EditPart

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -31,10 +31,10 @@
 import org.eclipse.ui.ide.IDE;
 import org.seasar.framework.container.S2Container;
 
+import org.jiemamy.creator.JiemamyModelFactory;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.utils.ExceptionHandler;
 import org.jiemamy.serializer.JiemamySerializer;
-import org.jiemamy.spec.JiemamyModelFactory;
 import org.jiemamy.spec.model.RootModel;
 
 /**

Modified: zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF	2008-10-02 10:55:54 UTC (rev 1980)
+++ zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF	2008-10-02 11:32:44 UTC (rev 1981)
@@ -7,7 +7,7 @@
 Bundle-Vendor: Jiemamy Project
 Eclipse-BuddyPolicy: registered
 Eclipse-LazyStart: false
-Export-Package: org.jiemamy.spec,
+Export-Package: org.jiemamy.creator,
  org.jiemamy.spec.adapter,
  org.jiemamy.spec.exception,
  org.jiemamy.spec.extension,

Added: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/creator/FactoryStrategy.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/creator/FactoryStrategy.java	                        (rev 0)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/creator/FactoryStrategy.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/26
+ *
+ * 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.creator;
+
+/**
+ * Jiemamy関連クラスのインスタンス生成戦略インターフェイス。
+ * @author daisuke
+ */
+public interface FactoryStrategy {
+	
+	/**
+	 * Jiemamy関連のインスタンスを生成する。
+	 * @param <T> 
+	 * @param clazz 
+	 * @return Jiemamy関連のインスタンス
+	 */
+	<T>T create(Class<T> clazz);
+	
+}

Added: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/creator/JiemamyModelFactory.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/creator/JiemamyModelFactory.java	                        (rev 0)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/creator/JiemamyModelFactory.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/25
+ *
+ * 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.creator;
+
+import org.jiemamy.spec.exception.JiemamyRuntimeException;
+import org.jiemamy.spec.model.RootModel;
+
+/**
+ * 新しいJiemamy関連クラスのインスタンスを生成するためのファクトリ。
+ * @author daisuke
+ */
+public class JiemamyModelFactory {
+	
+	private static JiemamyModelFactory instance;
+	
+
+	/**
+	 * 新しい {@link RootModel} のインスタンスを取得する。
+	 * @return {@link RootModel}のインスタンス。
+	 */
+	public static RootModel createRoot() {
+		if (instance == null) {
+			throw new JiemamyRuntimeException("createInstance()呼び出し前に、init()が必要です。");
+		}
+		return instance.strategy.create(RootModel.class);
+	}
+	
+	/**
+	 * ファクトリを初期化する。
+	 * @param strategy インスタンス生成戦略
+	 */
+	public static void init(FactoryStrategy strategy) {
+		if (instance != null) {
+			return;
+//			throw new JiemamyRuntimeException("ファクトリは既に初期化済みです。");
+		}
+		instance = (new JiemamyModelFactory(strategy));
+	}
+	
+	/**
+	 * 与えられたJiemamy関連クラスのインスタンスを生成する。
+	 * @param <T> 生成するインスタンスの型
+	 * @param clazz 
+	 * @return 生成されたインスタンス
+	 */
+	static <T>T create(Class<T> clazz) {
+		return instance.strategy.create(clazz);
+	}
+	
+
+	/** インスタンス生成戦略 */
+	private FactoryStrategy strategy;
+	
+
+	/**
+	 * privateコンストラクタ。
+	 * @param strategy インスタンス生成戦略
+	 * @category instance creation
+	 */
+	private JiemamyModelFactory(FactoryStrategy strategy) {
+		this.strategy = strategy;
+	}
+}

Deleted: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/FactoryStrategy.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/FactoryStrategy.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/FactoryStrategy.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -1,35 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/09/26
- *
- * 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.spec;
-
-/**
- * Jiemamy関連クラスのインスタンス生成戦略インターフェイス。
- * @author daisuke
- */
-public interface FactoryStrategy {
-	
-	/**
-	 * Jiemamy関連のインスタンスを生成する。
-	 * @param <T> 
-	 * @param clazz 
-	 * @return Jiemamy関連のインスタンス
-	 */
-	<T>T create(Class<T> clazz);
-	
-}

Deleted: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/JiemamyModelFactory.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/JiemamyModelFactory.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/JiemamyModelFactory.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -1,132 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/09/25
- *
- * 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.spec;
-
-import org.jiemamy.spec.exception.JiemamyRuntimeException;
-import org.jiemamy.spec.extension.dialect.Dialect;
-import org.jiemamy.spec.model.RootModel;
-import org.jiemamy.spec.model.datatype.DataType;
-
-/**
- * 新しいJiemamy関連クラスのインスタンスを生成するためのファクトリ。
- * @author daisuke
- */
-public class JiemamyModelFactory {
-	
-	private static JiemamyModelFactory instance;
-	
-
-	/**
-	 * データ型 {@link DataType} を生成する。
-	 * @param fqcn 
-	 * @return
-	 */
-	public static DataType createDataType(String fqcn) {
-		return createDataType(fqcn, JiemamyModelFactory.class.getClassLoader());
-	}
-	
-	/**
-	 * データ型 {@link DataType} を生成する。
-	 * @param fqcn 
-	 * @param classLoader 
-	 * @return
-	 */
-	public static DataType createDataType(String fqcn, ClassLoader classLoader) {
-		if (instance == null) {
-			throw new JiemamyRuntimeException("createInstance()呼び出し前に、init()が必要です。");
-		}
-		try {
-			return (DataType) instance.strategy.create(Class.forName(fqcn, true, classLoader));
-		} catch (ClassNotFoundException e) {
-			throw new JiemamyRuntimeException(e);
-		}
-	}
-	
-	/**
-	 * SQL方言 {@link Dialect} を生成する。
-	 * @param fqcn 
-	 * @return
-	 */
-	public static Dialect createDialect(String fqcn) {
-		return createDialect(fqcn, JiemamyModelFactory.class.getClassLoader());
-	}
-	
-	/**
-	 * SQL方言 {@link Dialect} を生成する。
-	 * @param fqcn 
-	 * @param classLoader 
-	 * @return
-	 */
-	public static Dialect createDialect(String fqcn, ClassLoader classLoader) {
-		if (instance == null) {
-			throw new JiemamyRuntimeException("createInstance()呼び出し前に、init()が必要です。");
-		}
-		try {
-			return (Dialect) instance.strategy.create(Class.forName(fqcn, true, classLoader));
-		} catch (ClassNotFoundException e) {
-			throw new JiemamyRuntimeException(e);
-		}
-	}
-	
-	/**
-	 * 新しい {@link RootModel} のインスタンスを取得する。
-	 * @return {@link RootModel}のインスタンス。
-	 */
-	public static RootModel createRoot() {
-		if (instance == null) {
-			throw new JiemamyRuntimeException("createInstance()呼び出し前に、init()が必要です。");
-		}
-		return instance.strategy.create(RootModel.class);
-	}
-	
-	/**
-	 * TODO for daisuke
-	 * @param clazz 
-	 * @return
-	 */
-	public static <T>T getInstance(Class<T> clazz) {
-		return instance.strategy.create(clazz);
-	}
-	
-	/**
-	 * ファクトリを初期化する。
-	 * @param strategy インスタンス生成戦略
-	 */
-	public static void init(FactoryStrategy strategy) {
-		if (instance != null) {
-			return;
-//			throw new JiemamyRuntimeException("ファクトリは既に初期化済みです。");
-		}
-		instance = (new JiemamyModelFactory(strategy));
-	}
-	
-
-	/** インスタンス生成戦略 */
-	private FactoryStrategy strategy;
-	
-
-	/**
-	 * privateコンストラクタ。
-	 * @param strategy インスタンス生成戦略
-	 * @category instance creation
-	 */
-	private JiemamyModelFactory(FactoryStrategy strategy) {
-		this.strategy = strategy;
-	}
-}

Deleted: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/ModelChangeEvent.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/ModelChangeEvent.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/ModelChangeEvent.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -1,68 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/06/09
- * 
- * This file is part of Jiemamy-core.
- * 
- * 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.spec.util;
-
-import java.lang.reflect.Field;
-import java.util.EventObject;
-
-/**
- * モデル変更イベント。
- * 
- * DOCME JiemamyChangeEventみたいな名称が適切?(必ずしもModel用とは限らない?)
- * 
- * @author daisuke
- */
- @ SuppressWarnings("serial")
-public class ModelChangeEvent extends EventObject {
-	
-	/** 変更されたフィールド */
-	protected transient Field field;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public ModelChangeEvent() {
-		super(null);
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param source イベントが発生したオブジェクト
-	 * @param field 変更されたフィールド
-	 * @category instance creation
-	 */
-	public ModelChangeEvent(Observable source, Field field) {
-		super(source);
-		this.field = field;
-	}
-	
-	/**
-	 * 変更されたフィールドを取得する。
-	 * @return 変更されたフィールド
-	 */
-	public Field getField() {
-		return field;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String toString() {
-		return getClass().getName() + "[source=" + source + ", field=" + field + "]";
-	}
-}

Deleted: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/ModelChangeListener.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/ModelChangeListener.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/ModelChangeListener.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -1,34 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/06/09
- * 
- * This file is part of Jiemamy-core.
- * 
- * 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.spec.util;
-
-import java.util.EventListener;
-
-/**
- * モデルの変更に対するリスナ。
- * 
- * <p>{@link Observable}なインスタンスを監視することができる。</p>
- * 
- * @author daisuke
- */
-public interface ModelChangeListener extends EventListener {
-	
-	/**
-	 * モデルのフィールドが変更された際にコールされるメソッド。
-	 * @param e 変更されたモデルとフィールドを表す{@link ModelChangeEvent}
-	 */
-	void modelChanged(ModelChangeEvent e);
-	
-}

Deleted: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/Observable.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/Observable.java	2008-10-02 10:55:54 UTC (rev 1980)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/util/Observable.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -1,42 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/27
- * 
- * 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.spec.util;
-
-import java.lang.reflect.Field;
-
-/**
- * ModelChangeListenerが監視可能な対象を表現する。
- * @author shin1
- */
-public interface Observable {
-	
-	/**
-	 * モデルの変更リスナーを追加する。
-	 * @param listener 追加するリスナー
-	 */
-	void addModelChangeListener(ModelChangeListener listener);
-	
-	/**
-	 * リスナーにモデルの変更を通知する。
-	 * @param field 変更されたフィールド
-	 */
-	void fireModelChange(Field field);
-	
-	/**
-	 * モデルの変更リスナーを削除する。
-	 * @param listener 削除するリスナー
-	 */
-	void removeModelChangeListener(ModelChangeListener listener);
-}

Added: zeus/trunk/org.jiemamy.spec.event/src/main/java/ModelChangeEvent.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.event/src/main/java/ModelChangeEvent.java	                        (rev 0)
+++ zeus/trunk/org.jiemamy.spec.event/src/main/java/ModelChangeEvent.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -0,0 +1,54 @@
+
+
+import java.lang.reflect.Field;
+import java.util.EventObject;
+
+/**
+ * モデル変更イベント。
+ * 
+ * DOCME JiemamyChangeEventみたいな名称が適切?(必ずしもModel用とは限らない?)
+ * 
+ * @author daisuke
+ */
+ @ SuppressWarnings("serial")
+public class ModelChangeEvent extends EventObject {
+	
+	/** 変更されたフィールド */
+	protected transient Field field;
+	
+
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public ModelChangeEvent() {
+		super(null);
+	}
+	
+	/**
+	 * コンストラクタ。
+	 * @param source イベントが発生したオブジェクト
+	 * @param field 変更されたフィールド
+	 * @category instance creation
+	 */
+	public ModelChangeEvent(Observable source, Field field) {
+		super(source);
+		this.field = field;
+	}
+	
+	/**
+	 * 変更されたフィールドを取得する。
+	 * @return 変更されたフィールド
+	 */
+	public Field getField() {
+		return field;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		return getClass().getName() + "[source=" + source + ", field=" + field + "]";
+	}
+}

Added: zeus/trunk/org.jiemamy.spec.event/src/main/java/ModelChangeListener.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.event/src/main/java/ModelChangeListener.java	                        (rev 0)
+++ zeus/trunk/org.jiemamy.spec.event/src/main/java/ModelChangeListener.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -0,0 +1,20 @@
+
+
+import java.util.EventListener;
+
+/**
+ * モデルの変更に対するリスナ。
+ * 
+ * <p>{@link Observable}なインスタンスを監視することができる。</p>
+ * 
+ * @author daisuke
+ */
+public interface ModelChangeListener extends EventListener {
+	
+	/**
+	 * モデルのフィールドが変更された際にコールされるメソッド。
+	 * @param e 変更されたモデルとフィールドを表す{@link ModelChangeEvent}
+	 */
+	void modelChanged(ModelChangeEvent e);
+	
+}

Added: zeus/trunk/org.jiemamy.spec.event/src/main/java/Observable.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.event/src/main/java/Observable.java	                        (rev 0)
+++ zeus/trunk/org.jiemamy.spec.event/src/main/java/Observable.java	2008-10-02 11:32:44 UTC (rev 1981)
@@ -0,0 +1,28 @@
+
+
+import java.lang.reflect.Field;
+
+/**
+ * ModelChangeListenerが監視可能な対象を表現する。
+ * @author shin1
+ */
+public interface Observable {
+	
+	/**
+	 * モデルの変更リスナーを追加する。
+	 * @param listener 追加するリスナー
+	 */
+	void addModelChangeListener(ModelChangeListener listener);
+	
+	/**
+	 * リスナーにモデルの変更を通知する。
+	 * @param field 変更されたフィールド
+	 */
+	void fireModelChange(Field field);
+	
+	/**
+	 * モデルの変更リスナーを削除する。
+	 * @param listener 削除するリスナー
+	 */
+	void removeModelChangeListener(ModelChangeListener listener);
+}


Jiemamy-notify メーリングリストの案内
Back to archive index