svnno****@sourc*****
svnno****@sourc*****
2008年 11月 9日 (日) 09:17:13 JST
Revision: 2113
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=2113
Author: shin1
Date: 2008-11-09 09:17:13 +0900 (Sun, 09 Nov 2008)
Log Message:
-----------
コメントのフォーマットが壊れていた物を修正
Modified Paths:
--------------
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/AbstractModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/ColumnModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/DomainModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/RootModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/AbstractConnectionModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/AbstractRelationModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/ForeignKeyMappingChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/ForeignKeyModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/AbstractConstraintModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/CheckConstraintModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/ConstraintsModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/NotNullConstraintModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/PrimaryKeyConstraintModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/UniqueConstraintModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/dataset/InsertDataSetModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/dataset/RecordModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/AbstractDataTypeChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/GeneralDataTypeChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/SpecialDataTypeChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/index/IndexColumnModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/index/IndexModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/AbstractEntityModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/AbstractNodeModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/StickyModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/TableModelChangeSupportImpl.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/ViewModelChangeSupportImpl.java
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/AbstractModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/AbstractModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/AbstractModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/ColumnModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/ColumnModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/ColumnModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/DomainModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/DomainModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/DomainModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/RootModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/RootModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/RootModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model;
@@ -54,7 +58,11 @@
* {@inheritDoc}
*/
public void collectionChanged(ObservableCollectionChangeEvent<List<DomainModel>, DomainModel> event) {
- fireDomainsCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireDomainsCollectionChangeEvent(event);
+ }
}
};
@@ -72,7 +80,11 @@
*/
public void collectionChanged(
ObservableCollectionChangeEvent<List<AbstractNodeModel>, AbstractNodeModel> event) {
- fireNodesCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireNodesCollectionChangeEvent(event);
+ }
}
};
@@ -90,7 +102,11 @@
*/
public void collectionChanged(
ObservableCollectionChangeEvent<List<InsertDataSetModel>, InsertDataSetModel> event) {
- fireInsertDataSetsCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireInsertDataSetsCollectionChangeEvent(event);
+ }
}
};
@@ -108,7 +124,11 @@
*/
public void collectionChanged(
ObservableCollectionChangeEvent<List<JiemamyModelAppender>, JiemamyModelAppender> event) {
- fireAppendersCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireAppendersCollectionChangeEvent(event);
+ }
}
};
@@ -140,8 +160,7 @@
((ObservableList<AbstractNodeModel>) source.getNodes()).addListener(nodesCollectionChangeListener);
((ObservableList<InsertDataSetModel>) source.getInsertDataSets())
.addListener(insertDataSetsCollectionChangeListener);
- // 手動でコメントアウト
- // ((ObservableList<JiemamyModelAppender>) source.getAppenders()).addListener(appendersCollectionChangeListener);
+// ((ObservableList<JiemamyModelAppender>) source.getAppenders()).addListener(appendersCollectionChangeListener);
}
/**
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/AbstractConnectionModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/AbstractConnectionModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/AbstractConnectionModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.connection;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/AbstractRelationModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/AbstractRelationModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/AbstractRelationModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.connection;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/ForeignKeyMappingChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/ForeignKeyMappingChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/ForeignKeyMappingChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.connection;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/ForeignKeyModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/ForeignKeyModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/connection/ForeignKeyModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.connection;
@@ -52,7 +56,11 @@
*/
public void collectionChanged(
ObservableCollectionChangeEvent<List<ForeignKeyMapping>, ForeignKeyMapping> event) {
- fireMappingsCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireMappingsCollectionChangeEvent(event);
+ }
}
};
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/AbstractConstraintModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/AbstractConstraintModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/AbstractConstraintModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.constraint;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/CheckConstraintModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/CheckConstraintModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/CheckConstraintModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.constraint;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/ConstraintsModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/ConstraintsModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/ConstraintsModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.constraint;
@@ -22,14 +26,14 @@
import org.jiemamy.spec.model.constraint.ConstraintsModel;
/**
- * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、ConstraintSetModelからそれらを引き受ける。
+ * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、ConstraintsModelからそれらを引き受ける。
*
* @author shin1ogawa
*/
public class ConstraintsModelChangeSupportImpl extends AbstractModelChangeSupport implements ModelChangeSupport {
/**
- * ConstraintSetModelの属性の変更Eventを処理するListener
+ * ConstraintsModelの属性の変更Eventを処理するListener
*
* @see #fireModelChange(ModelChangeEvent)
*/
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/NotNullConstraintModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/NotNullConstraintModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/NotNullConstraintModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.constraint;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/PrimaryKeyConstraintModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/PrimaryKeyConstraintModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/PrimaryKeyConstraintModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.constraint;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/UniqueConstraintModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/UniqueConstraintModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/constraint/UniqueConstraintModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.constraint;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/dataset/InsertDataSetModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/dataset/InsertDataSetModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/dataset/InsertDataSetModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.dataset;
@@ -52,7 +56,11 @@
*/
public void collectionChanged(
ObservableCollectionChangeEvent<Map<AbstractEntityModel, java.util.List<org.jiemamy.spec.model.dataset.RecordModel>>, java.util.List<org.jiemamy.spec.model.dataset.RecordModel>> event) {
- fireRecordsCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireRecordsCollectionChangeEvent(event);
+ }
}
};
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/dataset/RecordModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/dataset/RecordModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/dataset/RecordModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.dataset;
@@ -51,7 +55,11 @@
* {@inheritDoc}
*/
public void collectionChanged(ObservableCollectionChangeEvent<Map<ColumnModel, String>, String> event) {
- fireValuesCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireValuesCollectionChangeEvent(event);
+ }
}
};
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/AbstractDataTypeChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/AbstractDataTypeChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/AbstractDataTypeChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.datatype;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/GeneralDataTypeChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/GeneralDataTypeChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/GeneralDataTypeChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.datatype;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/SpecialDataTypeChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/SpecialDataTypeChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/datatype/SpecialDataTypeChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.datatype;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/index/IndexColumnModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/index/IndexColumnModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/index/IndexColumnModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.index;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/index/IndexModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/index/IndexModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/index/IndexModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.index;
@@ -52,7 +56,11 @@
*/
public void collectionChanged(
ObservableCollectionChangeEvent<List<IndexColumnModel>, IndexColumnModel> event) {
- fireColumnsCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireColumnsCollectionChangeEvent(event);
+ }
}
};
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/AbstractEntityModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/AbstractEntityModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/AbstractEntityModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.node;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/AbstractNodeModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/AbstractNodeModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/AbstractNodeModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.node;
@@ -52,7 +56,11 @@
*/
public void collectionChanged(
ObservableCollectionChangeEvent<List<AbstractConnectionModel>, AbstractConnectionModel> event) {
- fireSourceConnectionsCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireSourceConnectionsCollectionChangeEvent(event);
+ }
}
};
@@ -70,7 +78,11 @@
*/
public void collectionChanged(
ObservableCollectionChangeEvent<List<AbstractConnectionModel>, AbstractConnectionModel> event) {
- fireTargetConnectionsCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireTargetConnectionsCollectionChangeEvent(event);
+ }
}
};
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/StickyModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/StickyModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/StickyModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.node;
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/TableModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/TableModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/TableModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.node;
@@ -53,7 +57,11 @@
* {@inheritDoc}
*/
public void collectionChanged(ObservableCollectionChangeEvent<List<ColumnModel>, ColumnModel> event) {
- fireColumnsCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireColumnsCollectionChangeEvent(event);
+ }
}
};
@@ -70,7 +78,11 @@
* {@inheritDoc}
*/
public void collectionChanged(ObservableCollectionChangeEvent<List<IndexModel>, IndexModel> event) {
- fireIndexesCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireIndexesCollectionChangeEvent(event);
+ }
}
};
@@ -88,7 +100,11 @@
*/
public void collectionChanged(
ObservableCollectionChangeEvent<List<CheckConstraintModel>, CheckConstraintModel> event) {
- fireChecksCollectionChangeEvent(event);
+ if (event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_ADD
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_REMOVE
+ && event.getTiming() != ObservableCollectionChangeEvent.Timing.BEFORE_SET) {
+ fireChecksCollectionChangeEvent(event);
+ }
}
};
@@ -122,36 +138,36 @@
}
/**
- * checksのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
+ * columnsのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
*
* @param event {@link ObservableCollectionChangeEvent}
*/
- public void fireChecksCollectionChangeEvent(
- ObservableCollectionChangeEvent<List<CheckConstraintModel>, CheckConstraintModel> event) {
+ public void fireColumnsCollectionChangeEvent(ObservableCollectionChangeEvent<List<ColumnModel>, ColumnModel> event) {
BeanDesc beanDesc = new BeanDescImpl(TableModelImpl.class);
- event.setField(beanDesc.getField("checks"));
+ event.setField(beanDesc.getField("columns"));
fireModelChange(event);
}
/**
- * columnsのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
+ * indexesのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
*
* @param event {@link ObservableCollectionChangeEvent}
*/
- public void fireColumnsCollectionChangeEvent(ObservableCollectionChangeEvent<List<ColumnModel>, ColumnModel> event) {
+ public void fireIndexesCollectionChangeEvent(ObservableCollectionChangeEvent<List<IndexModel>, IndexModel> event) {
BeanDesc beanDesc = new BeanDescImpl(TableModelImpl.class);
- event.setField(beanDesc.getField("columns"));
+ event.setField(beanDesc.getField("indexes"));
fireModelChange(event);
}
/**
- * indexesのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
+ * checksのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
*
* @param event {@link ObservableCollectionChangeEvent}
*/
- public void fireIndexesCollectionChangeEvent(ObservableCollectionChangeEvent<List<IndexModel>, IndexModel> event) {
+ public void fireChecksCollectionChangeEvent(
+ ObservableCollectionChangeEvent<List<CheckConstraintModel>, CheckConstraintModel> event) {
BeanDesc beanDesc = new BeanDescImpl(TableModelImpl.class);
- event.setField(beanDesc.getField("indexes"));
+ event.setField(beanDesc.getField("checks"));
fireModelChange(event);
}
}
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/ViewModelChangeSupportImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/ViewModelChangeSupportImpl.java 2008-11-08 19:38:53 UTC (rev 2112)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/model/node/ViewModelChangeSupportImpl.java 2008-11-09 00:17:13 UTC (rev 2113)
@@ -1,16 +1,20 @@
/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/02
- *
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/02
+ *
* 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.event.model.node;