- // UNKNOWN NODES
- for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
- unknownNodes.add(b.build());
- }
- Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP);
- instance.addUnknownSchemaNodes(unknownNodes);
+ RevisionAwareXPath whenStmt;
+ if (whenCondition == null) {
+ whenStmt = null;
+ } else {
+ whenStmt = new RevisionAwareXPathImpl(whenCondition, false);
+ }
+ instance.whenCondition = whenStmt;
+
+ // CHILD NODES
+ for (DataSchemaNodeBuilder node : addedChildNodes) {
+ childNodes.add(node.build());
+ }
+ instance.childNodes = ImmutableSet.copyOf(childNodes);
+
+ // USES
+ for (UsesNodeBuilder builder : addedUsesNodes) {
+ usesNodes.add(builder.build());
+ }
+ instance.uses = ImmutableSet.copyOf(usesNodes);