Fixes #772 Instance target bug #778
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
With the new export/import approach, we do not export instances that has no additional info to their bases, and because of this we can lose pointer target information. We introduced a combined id (guidOfTheRootOfInstantiation@relativePath) that can be used during the import to successfully recreate such relations.
| @@ -1031,6 +1061,8 @@ define(['common/util/assert', 'blob/BlobConfig'], function (ASSERT, BlobConfig) | |||
| core.setPointer(node, keys[i], null); | |||
| } else if (nodes[target] && toRemoveGuids.indexOf(target) === -1) { | |||
| core.setPointer(node, keys[i], nodes[target]); | |||
| } else if (isCombinedId(target)) { | |||
| core.setPointer(node, keys[i], getCombinedTarget(target)); | |||
| } else { | |||
| console.log('error handling needed???!!!???'); | |||
There was a problem hiding this comment.
How about bringing in that logger and/or throwing an exception here?
There was a problem hiding this comment.
I was checking the logger, but either the public API should be changed, or some global logger should be created.
On the other hand the given else branch is considered (again) a never run into branch, that is why I left it that way.
There was a problem hiding this comment.
How about throwing an exception?
It was probably meant not to be entered before either but it did.
Now if someone imports and doesn't pay attention to the logs they might end up with an incomplete model
|
Looks good besides two minor notes. Coverage looks good too. |
pmeijer
pushed a commit
that referenced
this pull request
Jan 8, 2016
Fixes #772 Instance target bug
|
Thanks a bunch |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The commits should be cherry-picked into the master as well.