|
11 | 11 | package com.avaloq.tools.ddk.xtext.resource.persistence; |
12 | 12 |
|
13 | 13 | import java.io.IOException; |
| 14 | +import java.util.ArrayDeque; |
14 | 15 | import java.util.ArrayList; |
| 16 | +import java.util.Deque; |
15 | 17 | import java.util.List; |
16 | 18 |
|
17 | 19 | import org.eclipse.emf.common.notify.Adapter; |
@@ -80,24 +82,30 @@ static void installProxyNodeModel(final Resource resource) { |
80 | 82 | ProxyCompositeNode rootNode = installProxyNodeModel(root, idToEObjectMap); |
81 | 83 | idToEObjectMap.trimToSize(); |
82 | 84 | rootNode.idToEObjectMap = idToEObjectMap; |
83 | | - |
| 85 | + // System.out.println(resource.getContents().size() + " -> " + idToEObjectMap.size()); |
84 | 86 | if (resource instanceof XtextResource) { |
85 | 87 | ((XtextResource) resource).setParseResult(new ParseResult(root, rootNode, false)); |
86 | 88 | } |
87 | 89 | } |
88 | 90 |
|
89 | 91 | private static ProxyCompositeNode installProxyNodeModel(final EObject eObject, final List<EObject> map) { |
90 | | - ProxyCompositeNode result = new ProxyCompositeNode(); |
91 | | - eObject.eAdapters().add(result); |
| 92 | + Deque<EObject> deque = new ArrayDeque<>(); |
| 93 | + deque.push(eObject); |
| 94 | + ProxyCompositeNode rootComposite = new ProxyCompositeNode(); |
| 95 | + eObject.eAdapters().add(rootComposite); |
92 | 96 | map.add(eObject); |
93 | 97 |
|
94 | | - for (FeatureIterator<EObject> it = (FeatureIterator<EObject>) eObject.eContents().iterator(); it.hasNext();) { |
95 | | - EObject child = it.next(); |
96 | | - if (!it.feature().isTransient()) { |
97 | | - installProxyNodeModel(child, map); |
| 98 | + while (!deque.isEmpty()) { |
| 99 | + for (FeatureIterator<EObject> it = (FeatureIterator<EObject>) deque.pop().eContents().reversed().iterator(); it.hasNext();) { |
| 100 | + EObject child = it.next(); |
| 101 | + if (!it.feature().isTransient()) { |
| 102 | + child.eAdapters().add(new ProxyCompositeNode()); |
| 103 | + map.add(child); |
| 104 | + deque.push(child); |
| 105 | + } |
98 | 106 | } |
99 | 107 | } |
100 | | - return result; |
| 108 | + return rootComposite; |
101 | 109 | } |
102 | 110 |
|
103 | 111 | /** |
|
0 commit comments