Visualization refactoring #587
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
Sequence diagrams now can be generated separately from other diagrams, in a new dialog window.
…sualization-and-execution
…e-diagram-visualization-and-execution
…sualization-and-execution
…e-diagram-visualization-and-execution
- Extracted static method for creating *PapyrusVisualizer* from *TxtUMLExporter*, as it would violate function separation. - Extracted cleanup operation from *TxtUMLExporter* to abstract method in *TxtUMLVisualizeWizard*, as it has to be different for different visualization methods anyway. - Removed `outputFolder` property from *TxtUMLExporter*. - **moved classes to packages**: - hu.elte.txtuml.export.papyrus.layout.txtuml.TxtUMLExporter - to: *hu.elte.txtuml.layout.export* - hu.elte.txtuml.export.papyrus.layout.txtuml.TxtUMLLayoutDescriptor - to: *hu.elte.txtuml.layout.export* - hu.elte.txtuml.export.papyrus.layout.txtuml.LayoutExportException - to: *hu.elte.txtuml.layout.export* - hu.elte.txtuml.export.papyrus.utils.LayoutUtils - to: *hu.elte.txtuml.layout.export.utils* - hu.elte.txtuml.export.papyrus.elementsarrangers.txtumllayout.LayoutVisualizerManager - to: *hu.elte.txtuml.visualizer* - hu.elte.txtuml.export.papyrus.elementsarrangers.ArrangeException - to: *hu.elte.txtuml.visualizer.exceptions*
…oft/txtUML into visualization-refactoring
If a diagram had `Spacing` as it's first annotation, visualization failed. Solved by removing an unnecessary check. The modified `hu.elte.txtuml.utils.eclipse.WizardUtils.getModelByAnnotations()` checked all annotations, and discarded those not containing any class properties. But then for some reason, if one annotation did not contain any class properties, it threw an exception instead of checking all other annotations. And throwing the exception was unnecessary anyway, since the method returns an `Optional` object, which was checked by the caller anyway. For the above reasons I just removed the check altogether.
- removed parameter `txtUMLLayout` from `TxtUMLVisualizeWizard.exportDiagrams()` because the first argument contained it already
- CRUCIAL NOTE: introduced a cycle into the build path that is currently unresolved
- you have to set this error type to warning in eclipse to compile the code
- Removed all code duplication in the visualization process
- introduced a new abstract class, `UML2VisualizeWizard` which represents all wizards which have a worlkflow which contains exporting to UML2, making a `TxtUMLLayoutDescriptor` and then exporting.
- the progress monitors and the different async execution methods behaved very weirdly - Papyrus used `Job`, JS an `IProgressService. I couldn't bring both into one method
- if I used `Job` for both, Firefox opened instead of Chrome upon JS visualization
- if I used `IProgressService` for both, Papyrus never stopped loading
- fixed the Papyrus visualization failure when there is already a "gen" folder present
- the problem was solved by refreshing the folder after cleanup
- reduced cleanup code duplication in `TxtUMLVisualizeWizard` and it's children (#582)
- removed plug-in dependency for `export.papyrus` from `export.javascript` - extraced `utils.eclipse.wizards` package to `wizards` project - adjusted plug-in dependencies accordingly in all necessary projects
- renamed `utils.eclipse.SaveUtils` to `utils.eclipse.EditorUtils`
- added static method `closeEditorByPath`, which closes the editor containing the file in path, if an editor is open for the file
- this was to fix a bug in papyrus visualization
- if the diagrams were open in editors, upon regeneration they would be corrupted
- now the cleanup procedure for `PapyrusVisualizeWizard` includes closing the open editors
|
Do not merge this before #574. |
djnemeth
changed the base branch from
sequence-diagram-visualization-and-execution
to
master
|
Jenkins, retest this, please. |
|
@szokolai-mate, please resolve the conflicts below. |
|
This pull request has been accidentally merged and should be reverted immediately. |
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.
Refactoring of the visualization elements, please see commit messages for full details.
Solves:
Packages affected:
hu.elte.txtuml.export.papyrushu.elte.txtuml.export.javascripthu.elte.txtuml.layout.exporthu.elte.txtuml.visualizerNew packages:
hu.elte.txtuml.wizards