svnno****@sourc*****
svnno****@sourc*****
2008年 9月 12日 (金) 15:48:38 JST
Revision: 1915 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1915 Author: daisuke_m Date: 2008-09-12 15:48:38 +0900 (Fri, 12 Sep 2008) Log Message: ----------- [CORE-69] AbstractConnectionModelのジェネリクスを廃止。 Modified Paths: -------------- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModel.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModel.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModel.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModel.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/InheritanceModel.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModel.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModel.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/AttachConnectionProcessor.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/DetachConnectionProcessor.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/IsCyclicProcessor.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GenerateForeignKeyNameProcessor.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetForeignKeyParents.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceChildren.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceParents.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetBendpointsProcessor.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetBendpointsProcessor.java artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java -------------- next part -------------- Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModel.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModel.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModel.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -67,8 +67,8 @@ * (対する、テーブルとカラムの間には親子の従属関係がある) * その為、connectionはnodeにぶら下がる形でなく、RootModelの中でリストを持ってみた。 */ - private ObservableSet<AbstractConnectionModel<?>> connections = - ObservableSet.decorate(new HashSet<AbstractConnectionModel<?>>()); + private ObservableSet<AbstractConnectionModel> connections = + ObservableSet.decorate(new HashSet<AbstractConnectionModel>()); /** * ダイアグラム表現(レイアウト等)のリスト @@ -102,7 +102,7 @@ for (AbstractNodeModel node : nodes) { node.dispose(); } - for (AbstractConnectionModel<?> connection : connections) { + for (AbstractConnectionModel connection : connections) { connection.dispose(); } for (DiagramPresentationModel diagramPresentation : diagramPresentations) { @@ -126,7 +126,7 @@ * コネクションのリストを取得する。 * @return コネクションのリスト */ - public Set<AbstractConnectionModel<?>> getConnections() { + public Set<AbstractConnectionModel> getConnections() { return connections; } @@ -246,7 +246,7 @@ * コネクションのリストを設定する。 * @param connections コネクションのリスト */ - void setConnections(ObservableSet<AbstractConnectionModel<?>> connections) { + void setConnections(ObservableSet<AbstractConnectionModel> connections) { this.connections = connections; } Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModel.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModel.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModel.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -18,25 +18,21 @@ */ package org.jiemamy.core.model.connection; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - import org.jiemamy.core.model.AbstractModel; import org.jiemamy.core.model.node.AbstractNodeModel; /** - * コネクション(FKと継承等)のAbstractノード。 + * コネクション(FKと継承等)の抽象クラス。 * * @author daisuke - * @param <T> 接続対象となるノードクラス */ -public abstract class AbstractConnectionModel<T extends AbstractNodeModel> extends AbstractModel { +public abstract class AbstractConnectionModel extends AbstractModel { /** 接続元ノード */ - private T source; + protected AbstractNodeModel source; /** 接続先ノード */ - private T target; + protected AbstractNodeModel target; /** @@ -45,8 +41,7 @@ * @param target 接続先ノード * @category instance creation */ - public AbstractConnectionModel(T source, T target) { - super(); + public AbstractConnectionModel(AbstractNodeModel source, AbstractNodeModel target) { this.source = source; this.target = target; } @@ -55,7 +50,7 @@ * 接続元ノードを取得する。 * @return 接続元ノード */ - public T getSource() { + public AbstractNodeModel getSource() { return source; } @@ -63,7 +58,7 @@ * 接続先ノードを取得する。 * @return 接続先ノード */ - public T getTarget() { + public AbstractNodeModel getTarget() { return target; } @@ -71,7 +66,7 @@ * 接続元ノードを設定する。 * @param source 接続元ノード */ - public void setSource(T source) { + public void setSource(AbstractNodeModel source) { this.source = source; } @@ -79,7 +74,7 @@ * 接続先ノードを設定する。 * @param target 接続先ノード */ - public void setTarget(T target) { + public void setTarget(AbstractNodeModel target) { this.target = target; } Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModel.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModel.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModel.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -18,14 +18,14 @@ */ package org.jiemamy.core.model.connection; -import org.jiemamy.core.model.node.TableModel; +import org.jiemamy.core.model.node.AbstractEntityModel; /** * コネクション(FKと継承)のAbstractモデル。 * * @author daisuke */ -public abstract class AbstractRelationModel extends AbstractConnectionModel<TableModel> { +public abstract class AbstractRelationModel extends AbstractConnectionModel { /** * コンストラクタ。 @@ -33,8 +33,41 @@ * @param target 接続先モデル * @category instance creation */ - public AbstractRelationModel(TableModel source, TableModel target) { + public AbstractRelationModel(AbstractEntityModel source, AbstractEntityModel target) { super(source, target); } + /** + * 接続元ノードを取得する。 + * @return 接続元ノード + */ + @Override + public AbstractEntityModel getSource() { + return (AbstractEntityModel) source; + } + + /** + * 接続先ノードを取得する。 + * @return 接続先ノード + */ + @Override + public AbstractEntityModel getTarget() { + return (AbstractEntityModel) target; + } + + /** + * 接続元ノードを設定する。 + * @param source 接続元ノード + */ + public void setSource(AbstractEntityModel source) { + super.setSource(source); + } + + /** + * 接続先ノードを設定する。 + * @param target 接続先ノード + */ + public void setTarget(AbstractEntityModel target) { + super.setTarget(target); + } } Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModel.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModel.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModel.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; +import org.jiemamy.core.model.node.AbstractEntityModel; import org.jiemamy.core.model.node.TableModel; import org.jiemamy.core.model.typedef.ColumnModel; import org.jiemamy.core.utils.ForEachUtil; @@ -93,7 +94,7 @@ * 既存のカラムにマッピングする場合は<tt>false</tt>を渡す。 * @category instance creation */ - public ForeignKeyModel(TableModel source, TableModel target, boolean createColumn) { + public ForeignKeyModel(AbstractEntityModel source, AbstractEntityModel target, boolean createColumn) { super(source, target); createMappings(createColumn); } @@ -108,10 +109,11 @@ public void createMappings(boolean createColumn) { mappings.clear(); - List<ColumnModel> referencePkColumns = ForEachUtil.accept(getTarget().getColumns(), new PrimaryKeyVisitor()); + TableModel tableModel = (TableModel) getTarget(); + List<ColumnModel> referencePkColumns = ForEachUtil.accept(tableModel.getColumns(), new PrimaryKeyVisitor()); for (ColumnModel referencePkColumn : referencePkColumns) { ForeignKeyMapping mapping = new ForeignKeyMapping(); - mapping.process(new SetDefaultColumnsProcessor(getSource(), referencePkColumn, createColumn)); + mapping.process(new SetDefaultColumnsProcessor((TableModel) getSource(), referencePkColumn, createColumn)); mappings.add(mapping); } } @@ -264,24 +266,6 @@ } /** - * 接続元(被制約)テーブルを設定する。 - * @param source 接続元テーブル - */ - @Override - public void setSource(TableModel source) { - super.setSource(source); - } - - /** - * 接続先(参照)テーブルを設定する。 - * @param target 接続先テーブル - */ - @Override - public void setTarget(TableModel target) { - super.setTarget(target); - } - - /** * マッピングのリストを設定する。 * @param mappings マッピングのリスト */ Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/InheritanceModel.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/InheritanceModel.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/InheritanceModel.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -18,7 +18,7 @@ */ package org.jiemamy.core.model.connection; -import org.jiemamy.core.model.node.TableModel; +import org.jiemamy.core.model.node.AbstractEntityModel; /** * 継承モデル。 @@ -42,8 +42,7 @@ * @param target 接続先モデル * @category instance creation */ - public InheritanceModel(TableModel source, TableModel target) { + public InheritanceModel(AbstractEntityModel source, AbstractEntityModel target) { super(source, target); } - } Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModel.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModel.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModel.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -34,12 +34,12 @@ public class AbstractNodeModel extends AbstractModel { /** このモデルを接続元とするコネクションのリスト */ - private List<AbstractConnectionModel<?>> sourceConnections = - ObservableList.decorate(new ArrayList<AbstractConnectionModel<?>>()); + private List<AbstractConnectionModel> sourceConnections = + ObservableList.decorate(new ArrayList<AbstractConnectionModel>()); /** このモデルを接続先とするコネクションのリスト */ - private List<AbstractConnectionModel<?>> targetConnections = - ObservableList.decorate(new ArrayList<AbstractConnectionModel<?>>()); + private List<AbstractConnectionModel> targetConnections = + ObservableList.decorate(new ArrayList<AbstractConnectionModel>()); /** @@ -47,10 +47,10 @@ */ @Override public void dispose() { - for (AbstractConnectionModel<?> source : sourceConnections) { + for (AbstractConnectionModel source : sourceConnections) { source.dispose(); } - for (AbstractConnectionModel<?> target : targetConnections) { + for (AbstractConnectionModel target : targetConnections) { target.dispose(); } super.dispose(); @@ -60,7 +60,7 @@ * このモデルを接続元とするコネクションのリストを取得する。 * @return このモデルを接続元とするコネクションのリスト */ - public List<AbstractConnectionModel<?>> getSourceConnections() { + public List<AbstractConnectionModel> getSourceConnections() { return sourceConnections; } @@ -68,7 +68,7 @@ * このモデルを接続先とするコネクションのリストを取得する。 * @return このモデルを接続先とするコネクションのリスト */ - public List<AbstractConnectionModel<?>> getTargetConnections() { + public List<AbstractConnectionModel> getTargetConnections() { return targetConnections; } @@ -76,7 +76,7 @@ * このモデルを接続元とするコネクションのリストを設定する。 * @param sourceConnections このモデルを接続元とするコネクションのリスト */ - void setSourceConnections(List<AbstractConnectionModel<?>> sourceConnections) { + void setSourceConnections(List<AbstractConnectionModel> sourceConnections) { this.sourceConnections = sourceConnections; } @@ -84,7 +84,7 @@ * このモデルを接続先とするコネクションのリストを設定する。 * @param targetConnections このモデルを接続先とするコネクションのリスト */ - void setTargetConnections(List<AbstractConnectionModel<?>> targetConnections) { + void setTargetConnections(List<AbstractConnectionModel> targetConnections) { this.targetConnections = targetConnections; } } Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModel.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModel.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModel.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -65,15 +65,15 @@ * * ベンドポイントがあれば座標のリストを持ち、なければエントリを持たない。 */ - private Map<AbstractConnectionModel<?>, List<JmPoint>> connectionLayouts = - ObservableMap.decorate(new HashMap<AbstractConnectionModel<?>, List<JmPoint>>()); + private Map<AbstractConnectionModel, List<JmPoint>> connectionLayouts = + ObservableMap.decorate(new HashMap<AbstractConnectionModel, List<JmPoint>>()); /** * コネクションのベンドポイント情報を取得する。 * @return コネクションのベンドポイント情報 */ - public Map<AbstractConnectionModel<?>, List<JmPoint>> getConnectionLayouts() { + public Map<AbstractConnectionModel, List<JmPoint>> getConnectionLayouts() { return connectionLayouts; } @@ -129,7 +129,7 @@ * コネクションのベンドポイント情報を設定する。 * @param connectionLayouts コネクションのベンドポイント情報 */ - void setConnectionLayouts(Map<AbstractConnectionModel<?>, List<JmPoint>> connectionLayouts) { + void setConnectionLayouts(Map<AbstractConnectionModel, List<JmPoint>> connectionLayouts) { this.connectionLayouts = connectionLayouts; } Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/AttachConnectionProcessor.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/AttachConnectionProcessor.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/AttachConnectionProcessor.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -20,7 +20,6 @@ import org.jiemamy.core.model.connection.AbstractConnectionModel; import org.jiemamy.core.model.connection.ForeignKeyModel; -import org.jiemamy.core.model.node.AbstractNodeModel; import org.jiemamy.core.utils.Processor; /** @@ -29,8 +28,7 @@ * {@link ForeignKeyModel}を作っただけではノードのステートが変化しない為、この処理をコールする必要がある。 * @author daisuke */ -public class AttachConnectionProcessor implements - Processor<AbstractConnectionModel<? extends AbstractNodeModel>, Void, RuntimeException> { +public class AttachConnectionProcessor implements Processor<AbstractConnectionModel, Void, RuntimeException> { /** プロセッサのsingletonインスタンス */ private volatile static AttachConnectionProcessor singleton; @@ -53,13 +51,13 @@ /** * {@inheritDoc} */ - public Void process(AbstractConnectionModel<? extends AbstractNodeModel> connection) { + public Void process(AbstractConnectionModel connection) { attachSource(connection); attachTarget(connection); return null; } - private void attachSource(AbstractConnectionModel<? extends AbstractNodeModel> connectionModel) { + private void attachSource(AbstractConnectionModel connectionModel) { assert connectionModel != null; assert connectionModel.getSource() != null; assert connectionModel.getSource().getSourceConnections() != null; @@ -68,7 +66,7 @@ } } - private void attachTarget(AbstractConnectionModel<? extends AbstractNodeModel> connectionModel) { + private void attachTarget(AbstractConnectionModel connectionModel) { if (connectionModel.getTarget().getTargetConnections().contains(connectionModel) == false) { connectionModel.getTarget().getTargetConnections().add(connectionModel); } Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/DetachConnectionProcessor.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/DetachConnectionProcessor.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/DetachConnectionProcessor.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -19,15 +19,13 @@ package org.jiemamy.core.utils.processor.connection; import org.jiemamy.core.model.connection.AbstractConnectionModel; -import org.jiemamy.core.model.node.AbstractNodeModel; import org.jiemamy.core.utils.Processor; /** * コネクションをデタッチする。 * @author daisuke */ -public class DetachConnectionProcessor implements - Processor<AbstractConnectionModel<? extends AbstractNodeModel>, Void, RuntimeException> { +public class DetachConnectionProcessor implements Processor<AbstractConnectionModel, Void, RuntimeException> { /** プロセッサのsingletonインスタンス */ private volatile static DetachConnectionProcessor singleton; @@ -39,7 +37,7 @@ */ public static DetachConnectionProcessor getInstance() { if (singleton == null) { - singleton = new DetachConnectionProcessor(); + singleton = (new DetachConnectionProcessor()); } return singleton; } @@ -50,7 +48,7 @@ /** * {@inheritDoc} */ - public Void process(AbstractConnectionModel<? extends AbstractNodeModel> connectionModel) { + public Void process(AbstractConnectionModel connectionModel) { boolean s = connectionModel.getSource().getSourceConnections().remove(connectionModel); boolean t = connectionModel.getTarget().getTargetConnections().remove(connectionModel); Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/IsCyclicProcessor.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/IsCyclicProcessor.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/IsCyclicProcessor.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -19,15 +19,13 @@ package org.jiemamy.core.utils.processor.connection; import org.jiemamy.core.model.connection.AbstractConnectionModel; -import org.jiemamy.core.model.node.AbstractNodeModel; import org.jiemamy.core.utils.Processor; /** * 自己参照コネクション(sourceとtargetが同一)かどうかを調べる。 * @author daisuke */ -public class IsCyclicProcessor implements - Processor<AbstractConnectionModel<? extends AbstractNodeModel>, Boolean, RuntimeException> { +public class IsCyclicProcessor implements Processor<AbstractConnectionModel, Boolean, RuntimeException> { /** プロセッサのsingletonインスタンス */ private volatile static IsCyclicProcessor singleton; @@ -39,7 +37,7 @@ */ public static IsCyclicProcessor getInstance() { if (singleton == null) { - singleton = new IsCyclicProcessor(); + singleton = (new IsCyclicProcessor()); } return singleton; } @@ -50,7 +48,7 @@ /** * {@inheritDoc} */ - public Boolean process(AbstractConnectionModel<? extends AbstractNodeModel> connectionModel) { + public Boolean process(AbstractConnectionModel connectionModel) { return connectionModel.getSource().equals(connectionModel.getTarget()); } Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GenerateForeignKeyNameProcessor.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GenerateForeignKeyNameProcessor.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GenerateForeignKeyNameProcessor.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -21,6 +21,7 @@ import java.util.Date; import org.jiemamy.core.model.connection.ForeignKeyModel; +import org.jiemamy.core.model.node.TableModel; import org.jiemamy.core.utils.Processor; /** @@ -52,8 +53,10 @@ */ public String process(ForeignKeyModel foreignKeyModel) { StringBuilder sb = new StringBuilder(); - sb.append("fkey_").append(foreignKeyModel.getSource().getName()).append("_").append( - foreignKeyModel.getTarget().getName()).append("_").append((new Date()).getTime()); + TableModel sourceTable = (TableModel) foreignKeyModel.getSource(); + TableModel targetTable = (TableModel) foreignKeyModel.getTarget(); + sb.append("fkey_").append(sourceTable.getName()).append("_").append(targetTable.getName()).append("_").append( + (new Date()).getTime()); foreignKeyModel.setName(sb.toString()); return sb.toString(); } Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -53,8 +53,8 @@ * {@inheritDoc} */ public Void process(ForeignKeyModel fkModel) { - TableModel targetTable = fkModel.getTarget(); - TableModel sourceTable = fkModel.getSource(); + TableModel targetTable = (TableModel) fkModel.getTarget(); + TableModel sourceTable = (TableModel) fkModel.getSource(); List<ColumnModel> targetPkColumns = targetTable.process(GetPrimaryKeyColumnsProcessor.getInstance()); // 編集によって参照先テーブル(targetTable)のPKが削除されていた場合、 Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetForeignKeyParents.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetForeignKeyParents.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetForeignKeyParents.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -59,7 +59,7 @@ private Set<AbstractEntityModel> processNonRecursive(AbstractEntityModel entity) { Set<AbstractEntityModel> parents = new HashSet<AbstractEntityModel>(); - for (AbstractConnectionModel<?> connection : entity.getSourceConnections()) { + for (AbstractConnectionModel connection : entity.getSourceConnections()) { if (connection instanceof ForeignKeyModel) { ForeignKeyModel fkModel = (ForeignKeyModel) connection; parents.add(fkModel.getTarget()); Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceChildren.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceChildren.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceChildren.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -60,7 +60,7 @@ private Set<AbstractEntityModel> processNonRecursive(AbstractEntityModel entity) { Set<AbstractEntityModel> children = new HashSet<AbstractEntityModel>(); - for (AbstractConnectionModel<?> relation : entity.getTargetConnections()) { + for (AbstractConnectionModel relation : entity.getTargetConnections()) { if (relation instanceof InheritanceModel) { InheritanceModel inheritanceModel = (InheritanceModel) relation; children.add(inheritanceModel.getSource()); Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceParents.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceParents.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceParents.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -60,7 +60,7 @@ private Set<AbstractEntityModel> processNonRecursive(AbstractEntityModel entity) { Set<AbstractEntityModel> parents = new HashSet<AbstractEntityModel>(); - for (AbstractConnectionModel<?> relation : entity.getSourceConnections()) { + for (AbstractConnectionModel relation : entity.getSourceConnections()) { if (relation instanceof InheritanceModel) { InheritanceModel inheritanceModel = (InheritanceModel) relation; parents.add(inheritanceModel.getTarget()); Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetBendpointsProcessor.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetBendpointsProcessor.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetBendpointsProcessor.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -22,7 +22,6 @@ import org.jiemamy.core.model.RootModel; import org.jiemamy.core.model.connection.AbstractConnectionModel; -import org.jiemamy.core.model.node.AbstractNodeModel; import org.jiemamy.core.model.presentation.JmPoint; import org.jiemamy.core.utils.Processor; @@ -34,7 +33,7 @@ private int index; - private AbstractConnectionModel<? extends AbstractNodeModel> connection; + private AbstractConnectionModel connection; /** @@ -43,7 +42,7 @@ * @param connection * @category instance creation */ - public GetBendpointsProcessor(int index, AbstractConnectionModel<? extends AbstractNodeModel> connection) { + public GetBendpointsProcessor(int index, AbstractConnectionModel connection) { this.index = index; this.connection = connection; } Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -22,7 +22,6 @@ import org.jiemamy.core.model.RootModel; import org.jiemamy.core.model.connection.AbstractConnectionModel; -import org.jiemamy.core.model.node.AbstractNodeModel; import org.jiemamy.core.model.presentation.JmPoint; import org.jiemamy.core.model.presentation.JmRectangle; import org.jiemamy.core.utils.Processor; @@ -40,7 +39,7 @@ private int index; - private AbstractConnectionModel<? extends AbstractNodeModel> connection; + private AbstractConnectionModel connection; /** @@ -49,7 +48,7 @@ * @param connection * @category instance creation */ - public ResetBendpointProcessor(int index, AbstractConnectionModel<? extends AbstractNodeModel> connection) { + public ResetBendpointProcessor(int index, AbstractConnectionModel connection) { this.index = index; this.connection = connection; } Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetBendpointsProcessor.java =================================================================== --- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetBendpointsProcessor.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetBendpointsProcessor.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -22,7 +22,6 @@ import org.jiemamy.core.model.RootModel; import org.jiemamy.core.model.connection.AbstractConnectionModel; -import org.jiemamy.core.model.node.AbstractNodeModel; import org.jiemamy.core.model.presentation.JmPoint; import org.jiemamy.core.utils.Processor; @@ -34,7 +33,7 @@ private int index; - private AbstractConnectionModel<? extends AbstractNodeModel> connection; + private AbstractConnectionModel connection; private List<JmPoint> bendpoints; @@ -46,8 +45,7 @@ * @param bendpoints 座標のリスト * @category instance creation */ - public SetBendpointsProcessor(int index, AbstractConnectionModel<? extends AbstractNodeModel> connection, - List<JmPoint> bendpoints) { + public SetBendpointsProcessor(int index, AbstractConnectionModel connection, List<JmPoint> bendpoints) { this.index = index; this.connection = connection; this.bendpoints = bendpoints; Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java =================================================================== --- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -100,7 +100,7 @@ // assemble edges for (Object obj : graphNodes) { EntityNode node = (EntityNode) obj; - List<AbstractConnectionModel<?>> conns = node.model.getSourceConnections(); + List<AbstractConnectionModel> conns = node.model.getSourceConnections(); CONN_LOOP: for (AbstractConnectionModel conn : conns) { if (conn.process(IsCyclicProcessor.getInstance())) { continue; @@ -135,10 +135,17 @@ private class ConnectionEdge extends Edge { - private AbstractConnectionModel<?> model; + private AbstractConnectionModel model; - public ConnectionEdge(EntityNode source, EntityNode target, AbstractConnectionModel<?> model) { + /** + * コンストラクタ。 + * @param source + * @param target + * @param model + * @category instance creation + */ + public ConnectionEdge(EntityNode source, EntityNode target, AbstractConnectionModel model) { super(source, target); this.model = model; } @@ -171,6 +178,14 @@ private Map<UUID, List<JmPoint>> oldBendpoints = new HashMap<UUID, List<JmPoint>>(); + /** + * コンストラクタ。 + * @param rootModel + * @param target + * @param x + * @param y + * @category instance creation + */ public LayoutCommand(RootModel rootModel, AbstractNodeModel target, int x, int y) { this.rootModel = rootModel; this.target = target; @@ -187,7 +202,7 @@ public void execute() { rootModel.process(new SetConstraintProcessor(MustBeMulti.ZERO, target, new JmRectangle(x, y, -1, -1))); oldBendpoints.clear(); - for (AbstractConnectionModel<?> conn : target.getSourceConnections()) { + for (AbstractConnectionModel conn : target.getSourceConnections()) { List<JmPoint> points = rootModel.process(new GetBendpointsProcessor(MustBeMulti.ZERO, conn)); oldBendpoints.put(conn.getId(), points); conn.process(new ResetBendpointProcessor(MustBeMulti.ZERO, conn)); @@ -199,7 +214,7 @@ */ @Override public void undo() { - for (AbstractConnectionModel<?> conn : target.getSourceConnections()) { + for (AbstractConnectionModel conn : target.getSourceConnections()) { rootModel.process(new SetBendpointsProcessor(MustBeMulti.ZERO, conn, oldBendpoints.get(conn.getId()))); } rootModel Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java =================================================================== --- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -49,13 +49,13 @@ /** * コネクション作成コマンド。 */ -public class CreateConnectionCommand<T extends AbstractNodeModel> extends Command { +public class CreateConnectionCommand extends Command { private RootModel rootModel; private AbstractNodeModel source, target; - private AbstractConnectionModel<T> connection; + private AbstractConnectionModel connection; /** Figureサイズ */ @SuppressWarnings("unused") @@ -67,7 +67,7 @@ * @param rootModel * @param connection 作成するコネクションモデル */ - public CreateConnectionCommand(RootModel rootModel, AbstractConnectionModel<T> connection) { + public CreateConnectionCommand(RootModel rootModel, AbstractConnectionModel connection) { this.rootModel = rootModel; this.connection = connection; } @@ -101,8 +101,8 @@ } } else if (connection instanceof InheritanceModel) { // 継承の二重コネクション禁止 - List<AbstractConnectionModel<?>> connections = source.getSourceConnections(); - for (AbstractConnectionModel<?> connection : connections) { + List<AbstractConnectionModel> connections = source.getSourceConnections(); + for (AbstractConnectionModel connection : connections) { if (connection instanceof InheritanceModel && connection.process(IsCyclicProcessor.getInstance())) { LogUtil.log(JiemamyPlugin.getDefault(), "attempt to connect double inheritance"); // RESOURCE return false; @@ -170,7 +170,7 @@ * ConnectionのSourceを設定する。 * @param source */ - public void setSource(T source) { + public void setSource(AbstractNodeModel source) { this.source = source; connection.setSource(source); } @@ -179,7 +179,7 @@ * ConnectionのTargetを設定する。 * @param target */ - public void setTarget(T target) { + public void setTarget(AbstractNodeModel target) { this.target = target; connection.setTarget(target); } Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java =================================================================== --- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -47,10 +47,10 @@ private AbstractNodeModel targetNode; /** 削除対象のモデルをソースとするコネクションのリスト */ - private List<AbstractConnectionModel<?>> sourceConnections = CollectionsUtil.newArrayList(); + private List<AbstractConnectionModel> sourceConnections = CollectionsUtil.newArrayList(); /** 削除対象のモデルをターゲットとするコネクションのリスト */ - private List<AbstractConnectionModel<?>> targetConnections = CollectionsUtil.newArrayList(); + private List<AbstractConnectionModel> targetConnections = CollectionsUtil.newArrayList(); /** エンティティ削除と共に削除された継承カラムの情報(undo用) THINK */ private Map<AbstractNodeModel, List<InheritanceColumnModel>> deletedInheritedColumns = @@ -76,12 +76,12 @@ sourceConnections.addAll(targetNode.getSourceConnections()); targetConnections.addAll(targetNode.getTargetConnections()); - for (AbstractConnectionModel<?> connection : sourceConnections) { + for (AbstractConnectionModel connection : sourceConnections) { // connection.firePropertyChange(delete!); connection.process(DetachConnectionProcessor.getInstance()); } - for (AbstractConnectionModel<?> connection : targetConnections) { + for (AbstractConnectionModel connection : targetConnections) { // connection.firePropertyChange(delete!); connection.process(DetachConnectionProcessor.getInstance()); if (connection instanceof InheritanceModel) { @@ -102,11 +102,11 @@ public void undo() { rootModel.getNodes().add(targetNode); -// for (AbstractConnectionModel<?> connection : sourceConnections) { +// for (AbstractConnectionModel connection : sourceConnections) { // connection.firePropertyChange(revert!); // } - for (AbstractConnectionModel<?> connection : targetConnections) { + for (AbstractConnectionModel connection : targetConnections) { if (connection instanceof InheritanceModel) { TableModel source = (TableModel) connection.getSource(); TableModel target = (TableModel) connection.getTarget(); Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java =================================================================== --- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -83,7 +83,7 @@ rootModel.getDiagramPresentations().get(MustBeMulti.ZERO).getNodeLayouts().put(entity, newRect); // ベンドポイントの移動 - for (AbstractConnectionModel<?> connection : entity.getSourceConnections()) { + for (AbstractConnectionModel connection : entity.getSourceConnections()) { List<JmPoint> newBendpoints = new ArrayList<JmPoint>(); List<JmPoint> oldBendpoints = rootModel.getDiagramPresentations().get(MustBeMulti.ZERO).getConnectionLayouts().get( Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java =================================================================== --- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -82,12 +82,12 @@ nodeModel.addModelChangeListener(this); // 自モデルから出るコネクションを監視開始 - for (AbstractConnectionModel<?> connection : nodeModel.getSourceConnections()) { + for (AbstractConnectionModel connection : nodeModel.getSourceConnections()) { connection.addModelChangeListener(this); } // 自モデルを指すコネクションを監視開始 - for (AbstractConnectionModel<?> connection : nodeModel.getTargetConnections()) { + for (AbstractConnectionModel connection : nodeModel.getTargetConnections()) { connection.addModelChangeListener(this); } } @@ -111,11 +111,11 @@ AbstractNodeModel entityModel = (AbstractNodeModel) getModel(); // 自モデルを指すコネクションを監視終了 - for (AbstractConnectionModel<?> connection : entityModel.getTargetConnections()) { + for (AbstractConnectionModel connection : entityModel.getTargetConnections()) { connection.removeModelChangeListener(this); } // 自モデルから出るコネクションを監視終了 - for (AbstractConnectionModel<?> connection : entityModel.getSourceConnections()) { + for (AbstractConnectionModel connection : entityModel.getSourceConnections()) { connection.removeModelChangeListener(this); } // 自モデルを監視終了 Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java =================================================================== --- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -41,12 +41,12 @@ entity.addModelChangeListener(this); // 自モデル発の関連監視 - for (AbstractConnectionModel<?> connection : entity.getSourceConnections()) { + for (AbstractConnectionModel connection : entity.getSourceConnections()) { connection.addModelChangeListener(this); } // 自モデル着の関連監視 - for (AbstractConnectionModel<?> connection : entity.getTargetConnections()) { + for (AbstractConnectionModel connection : entity.getTargetConnections()) { connection.addModelChangeListener(this); } @@ -65,10 +65,10 @@ for (AbstractEntityModel parent : entity.process(new GetInheritanceParents(false))) { parent.removeModelChangeListener(this); } - for (AbstractConnectionModel<?> connection : entity.getTargetConnections()) { + for (AbstractConnectionModel connection : entity.getTargetConnections()) { connection.removeModelChangeListener(this); } - for (AbstractConnectionModel<?> connection : entity.getSourceConnections()) { + for (AbstractConnectionModel connection : entity.getSourceConnections()) { connection.removeModelChangeListener(this); } entity.removeModelChangeListener(this); Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java =================================================================== --- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -40,8 +40,7 @@ */ @Override protected Command getConnectionCompleteCommand(CreateConnectionRequest request) { - CreateConnectionCommand<AbstractNodeModel> command = - (CreateConnectionCommand<AbstractNodeModel>) request.getStartCommand(); + CreateConnectionCommand command = (CreateConnectionCommand) request.getStartCommand(); command.setTarget((AbstractNodeModel) getHost().getModel()); return command; } @@ -52,9 +51,8 @@ @Override protected Command getConnectionCreateCommand(CreateConnectionRequest request) { RootModel rootModel = (RootModel) getHost().getRoot().getContents().getModel(); - CreateConnectionCommand<AbstractNodeModel> command = - new CreateConnectionCommand(rootModel, (AbstractConnectionModel<AbstractNodeModel>) request - .getNewObject()); + CreateConnectionCommand command = + new CreateConnectionCommand(rootModel, (AbstractConnectionModel) request.getNewObject()); command.setSource((AbstractNodeModel) getHost().getModel()); command.setFigureSize(getHostFigure().getSize()); request.setStartCommand(command); Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java =================================================================== --- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java 2008-09-11 21:50:08 UTC (rev 1914) +++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java 2008-09-12 06:48:38 UTC (rev 1915) @@ -34,17 +34,17 @@ public abstract class AbstractSerializeNodeModel extends AbstractSerializeModel { /** このモデルを接続先とする関係のリスト */ - private List<AbstractConnectionModel<?>> sourceConnections = CollectionsUtil.newArrayList(); + private List<AbstractConnectionModel> sourceConnections = CollectionsUtil.newArrayList(); /** このモデルを接続元とする関係のリスト */ - private List<AbstractConnectionModel<?>> targetConnections = CollectionsUtil.newArrayList(); + private List<AbstractConnectionModel> targetConnections = CollectionsUtil.newArrayList(); /** * このモデルを接続先とする関係のリストを取得する。 * @return このモデルを接続先とする関係のリスト */ - public Iterable<AbstractConnectionModel<?>> getSourceConnections() { + public Iterable<AbstractConnectionModel> getSourceConnections() { return sourceConnections; } @@ -52,7 +52,7 @@ * このモデルを接続元とする関係のリストを取得する。 * @return このモデルを接続元とする関係のリスト */ - public Iterable<AbstractConnectionModel<?>> getTargetConnections() { + public Iterable<AbstractConnectionModel> getTargetConnections() { return targetConnections; } @@ -60,7 +60,7 @@ * このモデルを接続先とする関係のリストを * @param sourceConnections このモデルを接続先とする関係のリスト */ - public void setSourceConnections(List<AbstractConnectionModel<?>> sourceConnections) { + public void setSourceConnections(List<AbstractConnectionModel> sourceConnections) { this.sourceConnections = sourceConnections; } @@ -68,7 +68,7 @@ * このモデルを接続元とする関係のリストを設定する。 * @param targetConnections このモデルを接続元とする関係のリスト */ - public void setTargetConnections(List<AbstractConnectionModel<?>> targetConnections) { + public void setTargetConnections(List<AbstractConnectionModel> targetConnections) { this.targetConnections = targetConnections; }