Commit: dcf9f622bfca08617a6d2514f2073a5c178632a3 - tmdmaker (git)

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

Commit MetaInfo

• Revision: dcf9f622bfca08617a6d2514f2073a5c178632a3 (tree)
• Zeit: 2009-12-19 13:45:56
• Autor: nakag <nakag@user...>
• Commiter: nakag

Log Message

アトリビュートリストの出力順をアトリビュート名、エンティティ名の順になるように修正。
同じアトリビュート名が１つにまとめられる不具合を合わせて修正。

Ändern Zusammenfassung

• modified: tmdmaker/src/jp/sourceforge/tmdmaker/generate/attributelist/AttributeListHtmlGenerator.java
• add: tmdmaker/src/jp/sourceforge/tmdmaker/generate/attributelist/EntityAttributePair.java
• modified: tmdmaker/src/jp/sourceforge/tmdmaker/generate/attributelist/attribute_list.html

Diff

--- a/tmdmaker/src/jp/sourceforge/tmdmaker/generate/attributelist/AttributeListHtmlGenerator.java
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/generate/attributelist/AttributeListHtmlGenerator.java
@@ -35,6 +35,7 @@ import jp.sourceforge.tmdmaker.model.CombinationTable;
 import jp.sourceforge.tmdmaker.model.Detail;
 import jp.sourceforge.tmdmaker.model.Diagram;
 import jp.sourceforge.tmdmaker.model.Entity;
+import jp.sourceforge.tmdmaker.model.Identifier;
 import jp.sourceforge.tmdmaker.model.MappingList;
 import jp.sourceforge.tmdmaker.model.ModelElement;
 import jp.sourceforge.tmdmaker.model.MultivalueAndSuperset;
@@ -95,22 +96,22 @@ public class AttributeListHtmlGenerator {
 				new File(rootDir, "index.html")));
 		// context.put("entities", findAvailableModel(model));
 		context.put("esc", new EscapeTool());
-		Map<Attribute, AbstractEntityModel> attributes = findAllAttributes(model);
+		Map<String, EntityAttributePair> attributes = findAllAttributes(model);
 
 		context.put("entities", findAvailableModel(model));
 		applyTemplate("summary.html", new File(rootDir, "summary.html"),
 				context);
 
-		context.put("attributes", attributes.keySet());
+		context.put("attributes", attributes.entrySet());
 
 		applyTemplate("attribute_list.html", new File(rootDir,
 				"attribute_list.html"), context);
 		File attributesDir = new File(rootDir, "attributes");
 		attributesDir.mkdir();
-		for (Map.Entry<Attribute, AbstractEntityModel> entry : attributes
+		for (Map.Entry<String, EntityAttributePair> entry : attributes
 				.entrySet()) {
-			Attribute attribute = entry.getKey();
-			AbstractEntityModel entity = entry.getValue();
+			Attribute attribute = entry.getValue().getAttribute();
+			AbstractEntityModel entity = entry.getValue().getModel();
 			context.put("attribute", attribute);
 			context.put("entity", entity);
 			if (entity instanceof Entity) {
@@ -119,9 +120,8 @@ public class AttributeListHtmlGenerator {
 			} else {
 				context.remove("entityType");
 			}
-			applyTemplate("attribute.html", new File(attributesDir, attribute
-					.getName()
-					+ ".html"), context);
+			applyTemplate("attribute.html", new File(attributesDir,
+					entry.getValue().createAttributeFileKey() + ".html"), context);
 		}
 	}
 
@@ -154,10 +154,11 @@ public class AttributeListHtmlGenerator {
 		return entities;
 	}
 
-	private Map<Attribute, AbstractEntityModel> findAllAttributes(
+	private Map<String, EntityAttributePair> findAllAttributes(
 			Diagram diagram) {
-		Map<Attribute, AbstractEntityModel> attributes = new TreeMap<Attribute, AbstractEntityModel>(
-				new Comparator<Attribute>() {
+
+		Map<String, EntityAttributePair> attributes = new TreeMap<String, EntityAttributePair>(
+				new Comparator<String>() {
 
 					/**
 					 * {@inheritDoc}
@@ -166,23 +167,29 @@ public class AttributeListHtmlGenerator {
 					 *      java.lang.Object)
 					 */
 					@Override
-					public int compare(Attribute o1, Attribute o2) {
-						return o1.getName().compareTo(o2.getName());
+					public int compare(String o1, String o2) {
+						return o1.compareTo(o2);
 
 					}
+					
 				});
 
 		for (AbstractEntityModel m : findAvailableModel(diagram)) {
 			if (m instanceof Entity) {
 				Entity e = (Entity) m;
-				attributes.put(e.getIdentifier(), e);
+				Identifier i = e.getIdentifier();
+				EntityAttributePair pair = new EntityAttributePair(e, i);
+				attributes.put(pair.createAttributeFileKey(), pair);
 			}
 			if (m instanceof Detail) {
 				Detail d = (Detail) m;
-				attributes.put(d.getDetailIdentifier(), d);
+				Identifier i = d.getDetailIdentifier();
+				EntityAttributePair pair = new EntityAttributePair(d, i);
+				attributes.put(pair.createAttributeFileKey(), pair);
 			}
 			for (Attribute a : m.getAttributes()) {
-				attributes.put(a, m);
+				EntityAttributePair pair = new EntityAttributePair(m, a);
+				attributes.put(pair.createAttributeFileKey(), pair);
 			}
 		}
 		return attributes;
@@ -209,4 +216,5 @@ public class AttributeListHtmlGenerator {
 			}
 		}
 	}
+	
 }

--- /dev/null
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/generate/attributelist/EntityAttributePair.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2009 TMD-Maker Project <http://tmdmaker.sourceforge.jp/>
+ * 
+ * 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 jp.sourceforge.tmdmaker.generate.attributelist;
+
+import jp.sourceforge.tmdmaker.model.AbstractEntityModel;
+import jp.sourceforge.tmdmaker.model.Attribute;
+
+/**
+ * エンティティ系モデルとアトリビュートの１：１のペアモデル
+ * 
+ * @author nakaG
+ * 
+ */
+public class EntityAttributePair {
+	private Attribute attribute;
+	private AbstractEntityModel model;
+
+	/**
+	 * コンストラクタ
+	 * 
+	 * @param model
+	 * @param attribute
+	 */
+	public EntityAttributePair(AbstractEntityModel model, Attribute attribute) {
+		this.model = model;
+		this.attribute = attribute;
+	}
+	public String createAttributeFileKey() {
+		return attribute.getName() + "_" + model.getName();
+	}
+	/**
+	 * @return the attribute
+	 */
+	public Attribute getAttribute() {
+		return attribute;
+	}
+	/**
+	 * @param attribute the attribute to set
+	 */
+	public void setAttribute(Attribute attribute) {
+		this.attribute = attribute;
+	}
+	/**
+	 * @return the model
+	 */
+	public AbstractEntityModel getModel() {
+		return model;
+	}
+	/**
+	 * @param model the model to set
+	 */
+	public void setModel(AbstractEntityModel model) {
+		this.model = model;
+	}
+	
+}

--- a/tmdmaker/src/jp/sourceforge/tmdmaker/generate/attributelist/attribute_list.html
+++ b/tmdmaker/src/jp/sourceforge/tmdmaker/generate/attributelist/attribute_list.html
@@ -23,7 +23,7 @@
   <strong><a href="summary.html" target="attribute_frame">対象エンティティ一覧</a></strong><br>
   #foreach($attr in $attributes)
     &nbsp;
-    <a href="attributes/${attr.name}.html" target="attribute_frame">$esc.html($attr.name)</a><br>
+    <a href="attributes/${attr.value.createAttributeFileKey()}.html" target="attribute_frame">$esc.html($attr.value.attribute.name)</a><br>
   #end
   </body>
 </html>
\ No newline at end of file