Merge pull request #3 from ChangeVision/develop

属性を持ったトピックなどを読み込むと例外が発生する問題に対する修正
shoito · Dec 18, 2013 · c4d7adb · c4d7adb
2 parents 515630f + f5a88fe
commit c4d7adb
Show file tree

Hide file tree

Showing 12 changed files with 1,871 additions and 1,029 deletions.
diff --git a/src/main/java/com/github/astah/mm2asta/MmWalker.java b/src/main/java/com/github/astah/mm2asta/MmWalker.java
@@ -82,7 +82,7 @@ private Map read(String filePath) throws SAXException, JAXBException, FileNotFou
 	private void scan(INodePresentation parent, Node node) throws Throwable {
 		INodePresentation topic = scanNode(parent, node);	
 
-		List<Object> arrowlinkOrCloudOrEdge = node.getArrowlinkOrCloudOrEdge();
+		List<Object> arrowlinkOrCloudOrEdge = node.getArrowlinkOrAttributeOrAttributeLayout();
 		for (Object element : arrowlinkOrCloudOrEdge) {
 			if (element instanceof Node) {
 				scan(topic, (Node) element);
@@ -104,7 +104,7 @@ private INodePresentation scanNode(INodePresentation parent, Node node) throws T
 		String text = node.getTEXT();
 
 		if (text == null) { // Rich Long Node
-			List<Object> arrowlinkOrCloudOrEdge = node.getArrowlinkOrCloudOrEdge();
+			List<Object> arrowlinkOrCloudOrEdge = node.getArrowlinkOrAttributeOrAttributeLayout();
 			for (Object obj : arrowlinkOrCloudOrEdge) {
 				if (obj instanceof Richcontent && ((Richcontent) obj).getTYPE().equalsIgnoreCase("node")) {
 					Html html = ((Richcontent) obj).getHtml();