fixed import of packed nodes if they were the root node imported

chutch · Feb 1, 2013 · c294f38 · c294f38
1 parent e08590e
commit c294f38
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/source/src/velir/intellij/cq5/actions/content/DestructiveImport.java b/source/src/velir/intellij/cq5/actions/content/DestructiveImport.java
@@ -53,9 +53,11 @@ public void run() {
 							try {
 								// if this node is a "typed" node, get the VNode version of it
 								VNode vNode = null;
+								Element rootElement = null;
 								PsiFile contentFile = directory.findFile(".content.xml");
 								if (contentFile != null) {
-									vNode = VNode.makeVNode(contentFile.getVirtualFile().getInputStream());
+									rootElement = JDOMUtil.loadDocument(contentFile.getVirtualFile().getInputStream()).getRootElement();
+									vNode = VNode.makeVNode(rootElement);
 								}
 
 								// get/create rootNode
@@ -76,6 +78,7 @@ public void run() {
 								// set root node properties, if it has them
 								if (vNode != null) {
 									setProperties(rootNode, vNode);
+									unpackRecursively(rootElement, rootNode);
 								}
 
 								// start import to jcr