Fix model loader crash and animation layer activation #199
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
contributes to #197 Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
consider both ActivatedLayers and ActivatedTransientLayers Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
ebousse
reviewed
Aug 4, 2021
| openEditorSubMonitor.newChild(1)); | ||
| ToolManagement toolManagement = DiagramPlugin.getDefault().getToolManagement(diagram); | ||
| toolManagement.addToolFilter(new ToolFilter() { | ||
| if(representation instanceof DSemanticDiagram) { |
There was a problem hiding this comment.
This line is in fact almost the only real change introduced in the PR, correct?
There was a problem hiding this comment.
Right for item 1 of the description
for item 2 see my second comment
dvojtise
commented
Aug 4, 2021
| || layerName.equalsIgnoreCase("Animation"); | ||
| boolean mustBeActive = mustBeActiveForAnimation || mustBeActiveForDebug; | ||
| hasADebugLayer = hasADebugLayer || mustBeActiveForDebug; | ||
| if (mustBeActive && !diagram.getActivatedLayers().contains(l) && !diagram.getActivatedTransientLayers().contains(l)) { |
There was a problem hiding this comment.
this is the second line that has changed (most other changes are due to the new indentation)
(added && !diagram.getActivatedTransientLayers().contains(l))
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.
Description
(Actually, ignore other representations as we don't know how to animate them)
Contribution to issues
Fixes #197