• R/O
  • HTTP
  • SSH
  • HTTPS

tmdmaker: Commit

TMD-Maker(T字形ER図作成ツール)のEclipse Plugin,RCP,Webサイト用


Commit MetaInfo

Revision107619e91adb3f3210619389322f09f01b45ca13 (tree)
Time2014-08-23 14:24:18
Authornakag <nakag@user...>
Commiternakag

Log Message

Merge branch 'develop'

Change Summary

Incremental Difference

--- a/tmdmaker.core/build.properties
+++ b/tmdmaker.core/build.properties
@@ -1,3 +1,4 @@
1+javacDefaultEncoding.. = UTF-8
12 source.. = src/
23 output.. = bin/
34 bin.includes = META-INF/,\
--- a/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/AbstractEntityModel.java
+++ b/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/AbstractEntityModel.java
@@ -1,5 +1,5 @@
11 /*
2- * Copyright 2009 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
2+ * Copyright 2009-2014 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
@@ -476,7 +476,7 @@ public abstract class AbstractEntityModel extends ConnectableElement {
476476 for (Map.Entry<AbstractEntityModel, ReusedIdentifier> e : getReusedIdentifieres()
477477 .entrySet()) {
478478 ReusedIdentifier ri = e.getValue();
479- for (IdentifierRef i : ri.getIdentifires()) {
479+ for (IdentifierRef i : ri.getUniqueIdentifieres()) {
480480 rx = Math.max(i.getName().length() + RMARK_SIZE, rx);
481481 }
482482 }
--- a/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/CombinationTable.java
+++ b/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/CombinationTable.java
@@ -1,5 +1,5 @@
11 /*
2- * Copyright 2009-2010 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
2+ * Copyright 2009-2014 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
1515 */
1616 package jp.sourceforge.tmdmaker.model;
1717
18+import java.util.Iterator;
1819 import java.util.Map;
1920
2021 /**
@@ -39,6 +40,7 @@ public class CombinationTable extends AbstractEntityModel {
3940 @Override
4041 public ReusedIdentifier createReusedIdentifier() {
4142 ReusedIdentifier returnValue = new ReusedIdentifier(keyModels.getSarogateKey());
43+ checkDuplicateTargetReusedIdentifieres();
4244 for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : this.reusedIdentifieres
4345 .entrySet()) {
4446 returnValue.addAll(rk.getValue().getIdentifires());
@@ -46,6 +48,65 @@ public class CombinationTable extends AbstractEntityModel {
4648 return returnValue;
4749 }
4850
51+ @Override
52+ public Map<AbstractEntityModel, ReusedIdentifier> getReusedIdentifieres() {
53+ checkDuplicateTargetReusedIdentifieres();
54+ return super.getReusedIdentifieres();
55+ }
56+
57+ private Map.Entry<AbstractEntityModel, ReusedIdentifier> getSource() {
58+ Iterator<Map.Entry<AbstractEntityModel, ReusedIdentifier>> it = super
59+ .getReusedIdentifieres().entrySet().iterator();
60+ if (it.hasNext()) {
61+ return it.next();
62+ }
63+ return null;
64+ }
65+
66+ private Map.Entry<AbstractEntityModel, ReusedIdentifier> getTarget() {
67+ Iterator<Map.Entry<AbstractEntityModel, ReusedIdentifier>> it = super
68+ .getReusedIdentifieres().entrySet().iterator();
69+
70+ // sourceは読み飛ばす
71+ if (!it.hasNext()) {
72+ return null;
73+ }
74+ it.next();
75+
76+ if (it.hasNext()) {
77+ return it.next();
78+ }
79+ return null;
80+ }
81+
82+ private void checkDuplicateTargetReusedIdentifieres() {
83+ Map.Entry<AbstractEntityModel, ReusedIdentifier> source = getSource();
84+ Map.Entry<AbstractEntityModel, ReusedIdentifier> target = getTarget();
85+ if (source == null || target == null) {
86+ return;
87+ }
88+ for (IdentifierRef i : target.getValue().getIdentifires()) {
89+ if (containIdentifier(source.getValue(), i)) {
90+ i.setDuplicate(true);
91+ } else {
92+ i.setDuplicate(false);
93+ }
94+ }
95+ }
96+
97+ private boolean containIdentifier(ReusedIdentifier source, IdentifierRef target) {
98+
99+ for (IdentifierRef s : source.getIdentifires()) {
100+ // sourceに存在するIdentifierと同じのIdentifierがtargetに存在する場合は、
101+ // そのIdentifier省略する。
102+ // TODO 現状では名称の一致をもって同一Identifierとみなす
103+ if (target.getName().equals(s.getName())) {
104+ return true;
105+ }
106+ }
107+ return false;
108+ }
109+
49110 /**
50111 *
51112 * {@inheritDoc}
@@ -120,4 +181,16 @@ public class CombinationTable extends AbstractEntityModel {
120181 super.copyTo(to);
121182 }
122183
184+ /**
185+ * {@inheritDoc}
186+ *
187+ * @see jp.sourceforge.tmdmaker.model.AbstractEntityModel#fireIdentifierChanged
188+ * (jp.sourceforge.tmdmaker.model.AbstractConnectionModel)
189+ */
190+ @Override
191+ public void fireIdentifierChanged(AbstractConnectionModel callConnection) {
192+ checkDuplicateTargetReusedIdentifieres();
193+ super.fireIdentifierChanged(callConnection);
194+ }
195+
123196 }
--- a/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/Detail.java
+++ b/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/Detail.java
@@ -1,5 +1,5 @@
11 /*
2- * Copyright 2009 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
2+ * Copyright 2009-2014 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
@@ -152,7 +152,7 @@ public class Detail extends AbstractEntityModel {
152152
153153 private int calcurateMaxOriginalIdentifierRefSize() {
154154 int i = 0;
155- for (IdentifierRef ir : originalReusedIdentifier.getIdentifires()) {
155+ for (IdentifierRef ir : originalReusedIdentifier.getUniqueIdentifieres()) {
156156 i = Math.max(ir.getName().length(), i);
157157 }
158158 return i;
--- a/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/IdentifierRef.java
+++ b/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/IdentifierRef.java
@@ -1,5 +1,5 @@
11 /*
2- * Copyright 2009-2010 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
2+ * Copyright 2009-2014 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
@@ -26,6 +26,9 @@ public class IdentifierRef extends Identifier {
2626 /** 元の個体指定子 */
2727 private Identifier original;
2828
29+ /** 重複キー(対照表限定利用) */
30+ private Boolean duplicate = null;
31+
2932 /**
3033 * コンストラクタ
3134 *
@@ -64,7 +67,7 @@ public class IdentifierRef extends Identifier {
6467 }
6568 return returnName;
6669 }
67-
70+
6871 public boolean isSame(IdentifierRef identifierRef) {
6972 return this.original.equals(identifierRef.getOriginal());
7073 }
@@ -82,6 +85,7 @@ public class IdentifierRef extends Identifier {
8285 }
8386 return returnName;
8487 }
88+
8589 /**
8690 * {@inheritDoc}
8791 *
@@ -91,7 +95,7 @@ public class IdentifierRef extends Identifier {
9195 public void setImplementName(String implementName) {
9296 String oldValue = super.getImplementName();
9397 if (implementName == null || !implementName.equals(oldValue)) {
94- super.setImplementName(implementName);
98+ super.setImplementName(implementName);
9599 }
96100 }
97101
@@ -127,8 +131,30 @@ public class IdentifierRef extends Identifier {
127131 }
128132 to.setImplementName(getImplementName());
129133 to.setNullable(isNullable());
130-// to.setName(getName());
134+ // to.setName(getName());
131135
132136 }
133-
137+
138+ /**
139+ * @return the duplicate
140+ */
141+ public Boolean isDuplicate() {
142+ if (duplicate == null) {
143+ if (original instanceof IdentifierRef) {
144+ return ((IdentifierRef)original).isDuplicate();
145+ } else {
146+ return false;
147+ }
148+ }
149+ return duplicate;
150+ }
151+
152+ /**
153+ * @param duplicate
154+ * the duplicate to set
155+ */
156+ public void setDuplicate(Boolean duplicate) {
157+ this.duplicate = duplicate;
158+ }
159+
134160 }
--- a/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/ReusedIdentifier.java
+++ b/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/ReusedIdentifier.java
@@ -1,5 +1,5 @@
11 /*
2- * Copyright 2009-2013 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
2+ * Copyright 2009-2014 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
@@ -85,6 +85,21 @@ public class ReusedIdentifier implements Serializable {
8585 }
8686
8787 /**
88+ * 参照元の個体指定子(またはRe-usedキー)を返す。
89+ * sourceとtargetで重複する個体指定子は1つにまとめる。
90+ * @return 重複を排除した参照元の個体指定子(またはRe-usedキー)。
91+ */
92+ public List<IdentifierRef> getUniqueIdentifieres() {
93+ List<IdentifierRef> list = new ArrayList<IdentifierRef>(identifieres.size());
94+ for(IdentifierRef i : identifieres) {
95+ if (!i.isDuplicate()) {
96+ list.add(i);
97+ }
98+ }
99+ return Collections.unmodifiableList(list);
100+ }
101+
102+ /**
88103 * @return the sarogateKey
89104 */
90105 public List<SarogateKeyRef> getSarogateKeys() {
--- a/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/rule/ImplementRule.java
+++ b/tmdmaker.core/src/jp/sourceforge/tmdmaker/model/rule/ImplementRule.java
@@ -132,7 +132,7 @@ public class ImplementRule {
132132 if (model instanceof SubsetEntity) {
133133 ReusedIdentifier reused = ((SubsetEntity) model)
134134 .getOriginalReusedIdentifier();
135- for (IdentifierRef ref : reused.getIdentifires()) {
135+ for (IdentifierRef ref : reused.getUniqueIdentifieres()) {
136136 attributes.add(ref);
137137 }
138138 }
@@ -150,7 +150,7 @@ public class ImplementRule {
150150 attributes.add(s);
151151 }
152152 } else {
153- for (IdentifierRef ref : ri.getIdentifires()) {
153+ for (IdentifierRef ref : ri.getUniqueIdentifieres()) {
154154 attributes.add(ref);
155155 }
156156 }
--- a/tmdmaker.csv/build.properties
+++ b/tmdmaker.csv/build.properties
@@ -1,3 +1,4 @@
1+javacDefaultEncoding.. = UTF-8
12 source.. = src/
23 output.. = bin/
34 bin.includes = META-INF/,\
--- a/tmdmaker.ddlgenerator/src/jp/sourceforge/tmdmaker/generate/DdlUtilsConverter.java
+++ b/tmdmaker.ddlgenerator/src/jp/sourceforge/tmdmaker/generate/DdlUtilsConverter.java
@@ -228,12 +228,13 @@ public class DdlUtilsConverter {
228228 addReference(refences, localColumn, originalColumn);
229229 return refences;
230230 } else {
231- int reusedCount = reused.getIdentifires().size();
231+ List<IdentifierRef> list = reused.getUniqueIdentifieres();
232+ int reusedCount = list.size();
232233 // 再帰表は同一Reused×2となっているため1つ目のみを取得する
233234 if (isRecursive(reused)) {
234235 reusedCount = reusedCount / 2;
235236 }
236- List<IdentifierRef> list = reused.getIdentifires();
237+
237238 for (int i = 0; i < reusedCount; i++) {
238239 IdentifierRef iref = list.get(i);
239240 Column localColumn = convert(iref);
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/AttributeSettingPanel.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/AttributeSettingPanel.java
@@ -68,6 +68,7 @@ public class AttributeSettingPanel extends Composite {
6868 gridData12.verticalAlignment = GridData.FILL;
6969 gridData12.horizontalAlignment = GridData.BEGINNING;
7070 GridData gridData = new GridData();
71+ gridData.grabExcessVerticalSpace = true;
7172 gridData.horizontalAlignment = GridData.FILL;
7273 gridData.verticalAlignment = GridData.FILL;
7374 GridLayout gridLayout = new GridLayout();
@@ -170,7 +171,7 @@ public class AttributeSettingPanel extends Composite {
170171 tableColumn.setText("アトリビュート");
171172 this.setLayout(gridLayout);
172173 createControlComposite();
173- this.setSize(new Point(323, 177));
174+ this.setSize(new Point(338, 213));
174175 }
175176
176177 /**
@@ -201,6 +202,7 @@ public class AttributeSettingPanel extends Composite {
201202 gridData1.verticalAlignment = GridData.CENTER;
202203 gridData1.horizontalAlignment = GridData.FILL;
203204 controlComposite = new Composite(this, SWT.NONE);
205+ controlComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, true, 1, 1));
204206 controlComposite.setLayout(new GridLayout());
205207 newButton = new Button(controlComposite, SWT.NONE);
206208 newButton.setText("新規");
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/ImplementInfoEditPanel.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/ImplementInfoEditPanel.java
@@ -27,6 +27,8 @@ import org.eclipse.swt.events.FocusAdapter;
2727 import org.eclipse.swt.events.FocusEvent;
2828 import org.eclipse.swt.events.ModifyEvent;
2929 import org.eclipse.swt.events.ModifyListener;
30+import org.eclipse.swt.events.SelectionAdapter;
31+import org.eclipse.swt.events.SelectionEvent;
3032 import org.eclipse.swt.graphics.Point;
3133 import org.eclipse.swt.layout.GridData;
3234 import org.eclipse.swt.layout.GridLayout;
@@ -221,8 +223,18 @@ public class ImplementInfoEditPanel extends Composite {
221223 if (control instanceof Text) {
222224 final Text text = (Text) control;
223225 text.addFocusListener(new FocusAdapter(){
226+ int forcusGainIndex = -1;
227+ @Override
228+ public void focusGained(FocusEvent e) {
229+ System.out.println("text focusGained()");
230+ forcusGainIndex = tableSelectedIndex;
231+ super.focusGained(e);
232+ }
233+
224234 public void focusLost(FocusEvent e){
225- setData(tableEditor.getColumn(), text.getText());
235+ System.out.println("text focusLost()");
236+ System.out.println("index = " + forcusGainIndex);
237+ setData(tableEditor.getColumn(), text.getText(), forcusGainIndex);
226238 updateTable();
227239 // TableItem item = tableEditor.getItem();
228240 // item.setText(tableEditor.getColumn(), text.getText());
@@ -244,8 +256,22 @@ public class ImplementInfoEditPanel extends Composite {
244256 text.selectAll();
245257 text.setFocus();
246258 } else if (control instanceof Combo) {
259+ System.out.println("instanceof Combo");
247260 final Combo combo = (Combo) control;
261+
248262 combo.addFocusListener(new FocusAdapter() {
263+ int forcusGainedIndex = -1;
264+ /**
265+ * {@inheritDoc}
266+ *
267+ * @see org.eclipse.swt.events.FocusAdapter#focusGained(org.eclipse.swt.events.FocusEvent)
268+ */
269+ @Override
270+ public void focusGained(FocusEvent e) {
271+ System.out.println("combo focusGained");
272+ forcusGainedIndex = tableSelectedIndex;
273+ super.focusGained(e);
274+ }
249275
250276 /**
251277 * {@inheritDoc}
@@ -255,9 +281,10 @@ public class ImplementInfoEditPanel extends Composite {
255281 @Override
256282 public void focusLost(FocusEvent e) {
257283 // TableItem item = tableEditor.getItem();
284+ System.out.println("combo focusLost()");
258285 int index = combo.getSelectionIndex();
259286 if (index != -1) {
260- setData(tableEditor.getColumn(), String.valueOf(index));
287+ setData(tableEditor.getColumn(), String.valueOf(index), forcusGainedIndex);
261288 updateTable();
262289 // item.setText(tableEditor.getColumn(), combo.getItem(index));
263290 }
@@ -265,6 +292,37 @@ public class ImplementInfoEditPanel extends Composite {
265292 }
266293
267294 });
295+ combo.addSelectionListener(new SelectionAdapter(){
296+
297+ /**
298+ * {@inheritDoc}
299+ *
300+ * @see org.eclipse.swt.events.SelectionAdapter#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
301+ */
302+ @Override
303+ public void widgetDefaultSelected(SelectionEvent e) {
304+ System.out.println("widgetDefaultSelected()");
305+ super.widgetDefaultSelected(e);
306+ }
307+
308+ /**
309+ * {@inheritDoc}
310+ *
311+ * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
312+ */
313+ @Override
314+ public void widgetSelected(SelectionEvent e) {
315+ System.out.println("widgetSelected()");
316+ int index = combo.getSelectionIndex();
317+ if (index != -1) {
318+ setData(tableEditor.getColumn(), String.valueOf(index), tableSelectedIndex);
319+ updateTable();
320+ }
321+ combo.dispose();
322+
323+ }
324+
325+ });
268326 }
269327 }
270328 public void updateTable() {
@@ -301,8 +359,8 @@ public class ImplementInfoEditPanel extends Composite {
301359 }
302360
303361 }
304- private void setData(int columnIndex, String value) {
305- EditImplementAttribute a = attributes.get(tableSelectedIndex);
362+ private void setData(int columnIndex, String value, int attributeIndex) {
363+ EditImplementAttribute a = attributes.get(attributeIndex);
306364
307365 switch (columnIndex) {
308366 case COLUMN_NO_ATTRIBUTE_NAME:
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/IndexPanel.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/IndexPanel.java
@@ -1,5 +1,5 @@
11 /*
2- * Copyright 2009-2012 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
2+ * Copyright 2009-2014 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
@@ -62,25 +62,28 @@ public class IndexPanel extends Composite {
6262 GridData gridData16 = new GridData();
6363 gridData16.horizontalSpan = 2;
6464 gridData16.verticalAlignment = GridData.CENTER;
65- gridData16.grabExcessHorizontalSpace = false;
65+ gridData16.grabExcessHorizontalSpace = true;
6666 gridData16.horizontalAlignment = GridData.FILL;
6767 GridData gridData11 = new GridData();
68+ gridData11.grabExcessHorizontalSpace = true;
6869 gridData11.widthHint = 30;
6970 gridData11.verticalAlignment = GridData.CENTER;
70- gridData11.horizontalAlignment = GridData.CENTER;
71+ gridData11.horizontalAlignment = SWT.FILL;
7172 GridData gridData10 = new GridData();
73+ gridData10.grabExcessHorizontalSpace = true;
7274 gridData10.widthHint = 30;
7375 gridData10.verticalAlignment = GridData.CENTER;
74- gridData10.horizontalAlignment = GridData.CENTER;
76+ gridData10.horizontalAlignment = SWT.FILL;
7577 GridData gridData9 = new GridData();
7678 gridData9.widthHint = 30;
7779 gridData9.verticalAlignment = GridData.CENTER;
78- gridData9.horizontalAlignment = GridData.CENTER;
80+ gridData9.horizontalAlignment = SWT.FILL;
7981 GridData gridData8 = new GridData();
8082 gridData8.widthHint = 30;
8183 gridData8.verticalAlignment = GridData.CENTER;
82- gridData8.horizontalAlignment = GridData.CENTER;
84+ gridData8.horizontalAlignment = SWT.FILL;
8385 GridData gridData5 = new GridData();
86+ gridData5.grabExcessHorizontalSpace = true;
8487 gridData5.verticalSpan = 4;
8588 gridData5.verticalAlignment = GridData.FILL;
8689 gridData5.widthHint = 150;
@@ -135,12 +138,15 @@ public class IndexPanel extends Composite {
135138 masterCheckBox.setText("マスターキーに指定");
136139 masterCheckBox.setLayoutData(gridData17);
137140 Label filler31 = new Label(this, SWT.NONE);
141+ filler31.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1));
138142 attributeSelectedLabel = new Label(this, SWT.NONE);
139143 attributeSelectedLabel.setText("選択");
140144 Label filler8 = new Label(this, SWT.NONE);
141145 attributeNotSelectedLabel = new Label(this, SWT.NONE);
146+ attributeNotSelectedLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1));
142147 attributeNotSelectedLabel.setText("未選択");
143148 upButton = new Button(this, SWT.NONE);
149+ upButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
144150 upButton.setText("上へ");
145151 upButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
146152 public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
@@ -199,6 +205,7 @@ public class IndexPanel extends Composite {
199205 }
200206 });
201207 downButton = new Button(this, SWT.NONE);
208+ downButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
202209 downButton.setText("下へ");
203210 downButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
204211 public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
@@ -230,6 +237,7 @@ public class IndexPanel extends Composite {
230237 }
231238 });
232239 Label filler1 = new Label(this, SWT.NONE);
240+ filler1.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1));
233241 selectAllButton = new Button(this, SWT.NONE);
234242 selectAllButton.setText("<<");
235243 selectAllButton.setLayoutData(gridData10);
@@ -243,6 +251,7 @@ public class IndexPanel extends Composite {
243251 }
244252 });
245253 Label filler = new Label(this, SWT.NONE);
254+ filler.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1));
246255 removeAllButton = new Button(this, SWT.NONE);
247256 removeAllButton.setText(">>");
248257 removeAllButton.setLayoutData(gridData11);
@@ -256,7 +265,8 @@ public class IndexPanel extends Composite {
256265 }
257266 });
258267 Label filler2 = new Label(this, SWT.NONE);
259- this.setSize(new Point(449, 225));
268+ filler2.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1));
269+ this.setSize(new Point(464, 225));
260270 new Label(this, SWT.NONE);
261271 new Label(this, SWT.NONE);
262272 new Label(this, SWT.NONE);
@@ -274,7 +284,7 @@ public class IndexPanel extends Composite {
274284 gridData3.verticalAlignment = GridData.CENTER;
275285 GridData gridData2 = new GridData();
276286 gridData2.horizontalAlignment = GridData.FILL;
277- gridData2.grabExcessHorizontalSpace = false;
287+ gridData2.grabExcessHorizontalSpace = true;
278288 gridData2.horizontalSpan = 4;
279289 gridData2.verticalAlignment = GridData.CENTER;
280290 GridLayout gridLayout2 = new GridLayout();
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/IndexSettingPanel.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/IndexSettingPanel.java
@@ -57,7 +57,7 @@ public class IndexSettingPanel extends Composite {
5757
5858 private void initialize() {
5959 GridData gridData1 = new GridData();
60- gridData1.horizontalAlignment = GridData.CENTER;
60+ gridData1.horizontalAlignment = SWT.FILL;
6161 gridData1.verticalAlignment = GridData.BEGINNING;
6262 GridData gridData = new GridData();
6363 gridData.horizontalAlignment = GridData.FILL;
@@ -73,8 +73,10 @@ public class IndexSettingPanel extends Composite {
7373 indexTable.setLayoutData(gridData);
7474 indexTable.setLinesVisible(true);
7575 addButton = new Button(this, SWT.NONE);
76+ addButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
7677 addButton.setText("追加");
7778 updateButton = new Button(this, SWT.NONE);
79+ updateButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
7880 updateButton.setText("更新");
7981 updateButton
8082 .addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/ModelSelectPanel.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/ModelSelectPanel.java
@@ -72,6 +72,7 @@ public class ModelSelectPanel extends Composite {
7272 selectedLabel = new Label(this, SWT.NONE);
7373 selectedLabel.setText("選択");
7474 Label filler = new Label(this, SWT.NONE);
75+ filler.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
7576 candidateLabel = new Label(this, SWT.NONE);
7677 candidateLabel.setText("未選択");
7778 selectedList = new List(this, SWT.MULTI|SWT.BORDER|SWT.V_SCROLL|SWT.H_SCROLL);
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/SarogateKeyPanel2.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/SarogateKeyPanel2.java
@@ -60,7 +60,7 @@ public class SarogateKeyPanel2 extends Composite {
6060 GridLayout gridLayout = new GridLayout();
6161 gridLayout.numColumns = 2;
6262 this.setLayout(gridLayout);
63- setSize(new Point(271, 107));
63+ setSize(new Point(254, 113));
6464 checkBox = new Button(this, SWT.CHECK);
6565 checkBox.setText("サロゲートキーを追加する");
6666 checkBox.setLayoutData(gridData5);
@@ -75,6 +75,7 @@ public class SarogateKeyPanel2 extends Composite {
7575 implementNameText = new Text(this, SWT.BORDER);
7676 implementNameText.setLayoutData(gridData2);
7777 dataLabel = new Label(this, SWT.NONE);
78+ dataLabel.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 1, 1));
7879 dataLabel.setText("データ属性");
7980 createDataTypeComposite();
8081 }
@@ -140,10 +141,12 @@ public class SarogateKeyPanel2 extends Composite {
140141 dataTypeComposite.setLayout(gridLayout1);
141142 dataTypeComposite.setLayoutData(gridData);
142143 pLabel = new Label(dataTypeComposite, SWT.NONE);
144+ pLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
143145 pLabel.setText("桁数");
144146 precisionText = new Text(dataTypeComposite, SWT.BORDER);
145147 precisionText.setLayoutData(gridData3);
146148 sLabel = new Label(dataTypeComposite, SWT.NONE);
149+ sLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
147150 sLabel.setText("位取り");
148151 scaleText = new Text(dataTypeComposite, SWT.BORDER);
149152 scaleText.setLayoutData(gridData4);
@@ -158,7 +161,7 @@ public class SarogateKeyPanel2 extends Composite {
158161 gridData1.horizontalSpan = 4;
159162 gridData1.verticalAlignment = GridData.CENTER;
160163 gridData1.widthHint = 180;
161- gridData1.grabExcessHorizontalSpace = false;
164+ gridData1.grabExcessHorizontalSpace = true;
162165 gridData1.horizontalAlignment = GridData.FILL;
163166 dataTypeCombo = new Combo(dataTypeComposite, SWT.NONE);
164167 dataTypeCombo.setLayoutData(gridData1);
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/SubsetSettingPanel.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/SubsetSettingPanel.java
@@ -70,12 +70,13 @@ public class SubsetSettingPanel extends Composite {
7070 GridLayout gridLayout = new GridLayout();
7171 gridLayout.numColumns = 2;
7272 partitionCodeLabel = new Label(this, SWT.NONE);
73+ partitionCodeLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
7374 partitionCodeLabel.setText("区分コード");
7475 this.setLayout(gridLayout);
7576 createPartitionSelectCombo();
7677 createTypeGroup();
7778 createSubsetContainerComposite();
78- this.setSize(new Point(324, 178));
79+ this.setSize(new Point(224, 178));
7980 }
8081
8182 /**
@@ -100,13 +101,14 @@ public class SubsetSettingPanel extends Composite {
100101 GridData gridData = new GridData();
101102 gridData.horizontalSpan = 2;
102103 gridData.horizontalAlignment = GridData.FILL;
103- gridData.verticalAlignment = GridData.CENTER;
104+ gridData.verticalAlignment = SWT.FILL;
104105 gridData.grabExcessHorizontalSpace = false;
105106 typeGroup = new Group(this, SWT.NONE);
106107 typeGroup.setText("サブセット種類");
107108 typeGroup.setLayout(gridLayout1);
108109 typeGroup.setLayoutData(gridData);
109110 sameRadioButton = new Button(typeGroup, SWT.RADIO);
111+ sameRadioButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
110112 sameRadioButton.setText("同一");
111113 sameRadioButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
112114 public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
@@ -117,6 +119,7 @@ public class SubsetSettingPanel extends Composite {
117119 }
118120 });
119121 differenceRadioButton = new Button(typeGroup, SWT.RADIO);
122+ differenceRadioButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
120123 differenceRadioButton.setText("相違");
121124 differenceRadioButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
122125 public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
@@ -125,6 +128,7 @@ public class SubsetSettingPanel extends Composite {
125128 }
126129 });
127130 nullCheckBox = new Button(typeGroup, SWT.CHECK);
131+ nullCheckBox.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
128132 nullCheckBox.setText("NULLを排除");
129133 nullCheckBox.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
130134 public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
@@ -245,6 +249,7 @@ public class SubsetSettingPanel extends Composite {
245249 subsetControlComposite = new Composite(subsetContainerComposite, SWT.NONE);
246250 subsetControlComposite.setLayout(new GridLayout());
247251 newButton = new Button(subsetControlComposite, SWT.NONE);
252+ newButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
248253 newButton.setText("新規");
249254 newButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
250255 public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
@@ -257,6 +262,7 @@ public class SubsetSettingPanel extends Composite {
257262 }
258263 });
259264 deleteButton = new Button(subsetControlComposite, SWT.NONE);
265+ deleteButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
260266 deleteButton.setText("削除");
261267 deleteButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() {
262268 public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/VirtualSupersetSettingPanel.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/component/VirtualSupersetSettingPanel.java
@@ -49,12 +49,13 @@ public class VirtualSupersetSettingPanel extends Composite {
4949 GridLayout gridLayout = new GridLayout();
5050 gridLayout.numColumns = 3;
5151 virtualSupersetNameLabel = new Label(this, SWT.NONE);
52+ virtualSupersetNameLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
5253 virtualSupersetNameLabel.setText("みなしスーパーセット名");
5354 virtualSupersetNameText = new Text(this, SWT.BORDER);
5455 virtualSupersetNameText.setLayoutData(gridData);
5556 createTypeComposite();
5657 this.setLayout(gridLayout);
57- this.setSize(new Point(264, 66));
58+ this.setSize(new Point(288, 62));
5859 }
5960
6061 /**
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/model/EditImplementEntity.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/dialog/model/EditImplementEntity.java
@@ -85,7 +85,7 @@ public class EditImplementEntity {
8585 }
8686 if (model instanceof SubsetEntity) {
8787 ReusedIdentifier reused = ((SubsetEntity) model).getOriginalReusedIdentifier();
88- for (IdentifierRef ref : reused.getIdentifires()) {
88+ for (IdentifierRef ref : reused.getUniqueIdentifieres()) {
8989 attributes.add(new EditImplementAttribute(model, ref));
9090 }
9191
@@ -105,7 +105,7 @@ public class EditImplementEntity {
105105 } else {
106106 System.out.println("not ri.isSarogateKeyEnabled()");
107107 // 個体指定子の参照をカラムとして使用
108- for (IdentifierRef ref : ri.getIdentifires()) {
108+ for (IdentifierRef ref : ri.getUniqueIdentifieres()) {
109109 attributes.add(new EditImplementAttribute(model, ref));
110110 }
111111 }
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/CombinationTableEditPart.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/CombinationTableEditPart.java
@@ -1,5 +1,5 @@
11 /*
2- * Copyright 2009-2012 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
2+ * Copyright 2009,2014 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
1515 */
1616 package jp.sourceforge.tmdmaker.editpart;
1717
18-import java.util.ArrayList;
1918 import java.util.List;
2019 import java.util.Map;
2120
@@ -28,7 +27,6 @@ import jp.sourceforge.tmdmaker.model.AbstractConnectionModel;
2827 import jp.sourceforge.tmdmaker.model.AbstractEntityModel;
2928 import jp.sourceforge.tmdmaker.model.CombinationTable;
3029 import jp.sourceforge.tmdmaker.model.Identifier;
31-import jp.sourceforge.tmdmaker.model.RecursiveTable;
3230 import jp.sourceforge.tmdmaker.model.ReusedIdentifier;
3331 import jp.sourceforge.tmdmaker.ui.command.ModelEditCommand;
3432 import jp.sourceforge.tmdmaker.ui.command.TableDeleteCommand;
@@ -69,19 +67,12 @@ public class CombinationTableEditPart extends AbstractEntityEditPart {
6967 // entityFigure.removeAllAttributes();
7068
7169 entityFigure.setEntityName(table.getName());
72- List<String> reusedIdentifierNames = new ArrayList<String>();
73- for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : table
74- .getReusedIdentifieres().entrySet()) {
75- for (Identifier i : rk.getValue().getIdentifires()) {
76- if (!reusedIdentifierNames.contains(i.getName())
77- || rk.getKey() instanceof RecursiveTable) {
78- reusedIdentifierNames.add(i.getName());
79- }
70+ for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : table.getReusedIdentifieres()
71+ .entrySet()) {
72+ for (Identifier i : rk.getValue().getUniqueIdentifieres()) {
73+ entityFigure.addRelationship(i.getName());
8074 }
8175 }
82- for (String name : reusedIdentifierNames) {
83- entityFigure.addRelationship(name);
84- }
8576 setupColor(entityFigure, ModelAppearance.COMBINATION_TABLE);
8677 // for (Attribute a : atts) {
8778 // entityFigure.addAttribute(a.getName());
@@ -96,10 +87,8 @@ public class CombinationTableEditPart extends AbstractEntityEditPart {
9687 */
9788 @Override
9889 protected void createEditPolicies() {
99- installEditPolicy(EditPolicy.COMPONENT_ROLE,
100- new CombinationTableComponentEditPolicy());
101- installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
102- new TMDModelGraphicalNodeEditPolicy());
90+ installEditPolicy(EditPolicy.COMPONENT_ROLE, new CombinationTableComponentEditPolicy());
91+ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new TMDModelGraphicalNodeEditPolicy());
10392 installEditPolicy(EditPolicy.LAYOUT_ROLE, new EntityLayoutEditPolicy());
10493 }
10594
@@ -112,20 +101,17 @@ public class CombinationTableEditPart extends AbstractEntityEditPart {
112101 protected void onDoubleClicked() {
113102 logger.debug(getClass() + "#onDoubleClicked()");
114103 CombinationTable table = (CombinationTable) getModel();
115- CombinationTableEditDialog dialog = new CombinationTableEditDialog(
116- getViewer().getControl().getShell(), "対照表編集", table);
104+ CombinationTableEditDialog dialog = new CombinationTableEditDialog(getViewer().getControl()
105+ .getShell(), "対照表編集", table);
117106 if (dialog.open() == Dialog.OK) {
118107 CompoundCommand ccommand = new CompoundCommand();
119108
120- List<EditAttribute> editAttributeList = dialog
121- .getEditAttributeList();
109+ List<EditAttribute> editAttributeList = dialog.getEditAttributeList();
122110 addAttributeEditCommands(ccommand, table, editAttributeList);
123111
124- ModelEditCommand command = new ModelEditCommand(table,
125- dialog.getEditedValue());
112+ ModelEditCommand command = new ModelEditCommand(table, dialog.getEditedValue());
126113 ccommand.add(command);
127- getViewer().getEditDomain().getCommandStack()
128- .execute(ccommand.unwrap());
114+ getViewer().getEditDomain().getCommandStack().execute(ccommand.unwrap());
129115 }
130116
131117 }
@@ -135,8 +121,7 @@ public class CombinationTableEditPart extends AbstractEntityEditPart {
135121 * @author nakaG
136122 *
137123 */
138- private static class CombinationTableComponentEditPolicy extends
139- ComponentEditPolicy {
124+ private static class CombinationTableComponentEditPolicy extends ComponentEditPolicy {
140125 /**
141126 *
142127 * {@inheritDoc}
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/DetailEditPart.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/DetailEditPart.java
@@ -90,13 +90,13 @@ public class DetailEditPart extends AbstractEntityEditPart {
9090 // entityFigure.setEntityType(entity.getEntityType().toString());
9191 // figure.setIdentifier(entity.getIdentifier().getName());
9292 IdentifierRef original = entity.getOriginalReusedIdentifier()
93- .getIdentifires().get(0);
93+ .getUniqueIdentifieres().get(0);
9494 entityFigure.setIdentifier(original.getName());
9595 entityFigure.setIdentifier(entity.getDetailIdentifier().getName());
9696 for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : entity
9797 .getReusedIdentifieres().entrySet()) {
9898
99- for (IdentifierRef i : rk.getValue().getIdentifires()) {
99+ for (IdentifierRef i : rk.getValue().getUniqueIdentifieres()) {
100100 if (i.isSame(original)) {
101101 // nothing
102102 } else {
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/EntityEditPart.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/EntityEditPart.java
@@ -74,7 +74,7 @@ public class EntityEditPart extends AbstractEntityEditPart {
7474 entityFigure.setIdentifier(entity.getIdentifier().getName());
7575 for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : entity
7676 .getReusedIdentifieres().entrySet()) {
77- for (Identifier i : rk.getValue().getIdentifires()) {
77+ for (Identifier i : rk.getValue().getUniqueIdentifieres()) {
7878 entityFigure.addRelationship(i.getName());
7979 }
8080 }
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/LaputaEditPart.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/LaputaEditPart.java
@@ -65,7 +65,7 @@ public class LaputaEditPart extends AbstractEntityEditPart {
6565 entityFigure.setIdentifier(entity.getIdentifier().getName());
6666 for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : entity
6767 .getReusedIdentifieres().entrySet()) {
68- for (Identifier i : rk.getValue().getIdentifires()) {
68+ for (Identifier i : rk.getValue().getUniqueIdentifieres()) {
6969 entityFigure.addRelationship(i.getName());
7070 }
7171 }
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/MappingListEditPart.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/MappingListEditPart.java
@@ -66,7 +66,7 @@ public class MappingListEditPart extends AbstractEntityEditPart {
6666 entityFigure.setEntityName(table.getName());
6767 for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : table
6868 .getReusedIdentifieres().entrySet()) {
69- for (Identifier i : rk.getValue().getIdentifires()) {
69+ for (Identifier i : rk.getValue().getUniqueIdentifieres()) {
7070 entityFigure.addRelationship(i.getName());
7171 }
7272 }
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/MultivalueAndSupersetEditPart.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/MultivalueAndSupersetEditPart.java
@@ -83,7 +83,7 @@ public class MultivalueAndSupersetEditPart extends AbstractEntityEditPart {
8383 entityFigure.setEntityType(EntityType.MA.getLabel());
8484 // figure.setIdentifier(entity.getIdentifier().getName());
8585 IdentifierRef identifierRef = entity.getReusedIdentifieres().entrySet()
86- .iterator().next().getValue().getIdentifires().get(0);
86+ .iterator().next().getValue().getUniqueIdentifieres().get(0);
8787 entityFigure.setIdentifier(identifierRef.getName());
8888 // for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : entity
8989 // .getReusedIdentifieres().entrySet()) {
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/MultivalueOrEditPart.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/MultivalueOrEditPart.java
@@ -94,7 +94,7 @@ public class MultivalueOrEditPart extends AbstractEntityEditPart {
9494 entityFigure.setEntityType(EntityType.MO.getLabel());
9595 for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : entity
9696 .getReusedIdentifieres().entrySet()) {
97- for (Identifier i : rk.getValue().getIdentifires()) {
97+ for (Identifier i : rk.getValue().getUniqueIdentifieres()) {
9898 entityFigure.addRelationship(i.getName());
9999 }
100100 }
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/RecursiveTableEditPart.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/RecursiveTableEditPart.java
@@ -66,7 +66,7 @@ public class RecursiveTableEditPart extends AbstractEntityEditPart {
6666 entityFigure.setEntityName(table.getName());
6767 for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : table
6868 .getReusedIdentifieres().entrySet()) {
69- for (Identifier i : rk.getValue().getIdentifires()) {
69+ for (Identifier i : rk.getValue().getUniqueIdentifieres()) {
7070 entityFigure.addRelationship(i.getName());
7171 }
7272 }
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/SubsetEntityEditPart.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/SubsetEntityEditPart.java
@@ -76,16 +76,16 @@ public class SubsetEntityEditPart extends AbstractEntityEditPart {
7676 // do nothing
7777 } else {
7878 if (entity.isSupersetAnEntity()) {
79- entityFigure.setIdentifier(entity.getOriginalReusedIdentifier().getIdentifires()
79+ entityFigure.setIdentifier(entity.getOriginalReusedIdentifier().getUniqueIdentifieres()
8080 .get(0).getName());
8181 } else {
82- for (Identifier i : entity.getOriginalReusedIdentifier().getIdentifires()) {
82+ for (Identifier i : entity.getOriginalReusedIdentifier().getUniqueIdentifieres()) {
8383 entityFigure.addRelationship(i.getName());
8484 }
8585 }
8686 for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : entity
8787 .getReusedIdentifieres().entrySet()) {
88- for (Identifier i : rk.getValue().getIdentifires()) {
88+ for (Identifier i : rk.getValue().getUniqueIdentifieres()) {
8989 entityFigure.addRelationship(i.getName());
9090 }
9191 }
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/VirtualEntityEditPart.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/editpart/VirtualEntityEditPart.java
@@ -104,7 +104,7 @@ public class VirtualEntityEditPart extends AbstractEntityEditPart {
104104 // figure.setIdentifier(entity.getIdentifier().getName());
105105 for (Map.Entry<AbstractEntityModel, ReusedIdentifier> rk : entity
106106 .getReusedIdentifieres().entrySet()) {
107- for (Identifier i : rk.getValue().getIdentifires()) {
107+ for (Identifier i : rk.getValue().getUniqueIdentifieres()) {
108108 entityFigure.addRelationship(i.getName());
109109 }
110110 }
--- a/tmdmaker/src/jp/sourceforge/tmdmaker/treeeditpart/DetailTreeEditPart.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/treeeditpart/DetailTreeEditPart.java
@@ -50,12 +50,12 @@ public class DetailTreeEditPart extends AbstractEntityModelTreeEditPart implemen
5050 @Override
5151 protected void setIdentifiers() {
5252 Detail detail = getModel();
53- IdentifierRef original = detail.getOriginalReusedIdentifier().getIdentifires().get(0);
53+ IdentifierRef original = detail.getOriginalReusedIdentifier().getUniqueIdentifieres().get(0);
5454 addOriginalIdentifier(original);
5555 identifiers.add(detail.getDetailIdentifier());
5656
5757 for (ReusedIdentifier r : detail.getReusedIdentifieres().values()) {
58- for (IdentifierRef i : r.getIdentifires()) {
58+ for (IdentifierRef i : r.getUniqueIdentifieres()) {
5959 if (!i.isSame(original)) {
6060 identifiers.add(i);
6161 }
Show on old repository browser