JavaFX/GEF5 based graphical editor#2662
Merged
philip-alldredge merged 99 commits intomasterfrom Jul 6, 2021
Merged
Conversation
1183_ge_gef5 Conflicts: ge/org.osate.ge/src/org/osate/ge/aadl2/ui/internal/editor/ContributionHelper.java ge/org.osate.ge/src/org/osate/ge/aadl2/ui/internal/handlers/CreateNewDiagramHandler.java ge/org.osate.ge/src/org/osate/ge/aadl2/ui/internal/handlers/GoToAadlSourceHandler.java ge/org.osate.ge/src/org/osate/ge/aadl2/ui/internal/handlers/GoToImplementationDiagramHandler.java ge/org.osate.ge/src/org/osate/ge/aadl2/ui/internal/handlers/GoToPackageDiagramHandler.java ge/org.osate.ge/src/org/osate/ge/aadl2/ui/internal/handlers/GoToTypeDiagramHandler.java ge/org.osate.ge/src/org/osate/ge/aadl2/ui/internal/handlers/InstantiateHandler.java ge/org.osate.ge/src/org/osate/ge/aadl2/ui/internal/handlers/OpenAssociatedDiagramHandler.java ge/org.osate.ge/src/org/osate/ge/graphics/ArrowBuilder.java ge/org.osate.ge/src/org/osate/ge/graphics/Dimension.java ge/org.osate.ge/src/org/osate/ge/graphics/Point.java ge/org.osate.ge/src/org/osate/ge/graphics/PolyBuilder.java ge/org.osate.ge/src/org/osate/ge/graphics/internal/DeviceGraphic.java ge/org.osate.ge/src/org/osate/ge/graphics/internal/FeatureGroupTypeGraphic.java ge/org.osate.ge/src/org/osate/ge/graphics/internal/FolderGraphic.java ge/org.osate.ge/src/org/osate/ge/graphics/internal/Label.java ge/org.osate.ge/src/org/osate/ge/graphics/internal/MemoryGraphic.java ge/org.osate.ge/src/org/osate/ge/graphics/internal/NoteGraphic.java ge/org.osate.ge/src/org/osate/ge/graphics/internal/Poly.java ge/org.osate.ge/src/org/osate/ge/graphics/internal/ProcessorGraphic.java ge/org.osate.ge/src/org/osate/ge/internal/diagram/runtime/DiagramModificationListener.java ge/org.osate.ge/src/org/osate/ge/internal/diagram/runtime/botree/TreeUpdater.java ge/org.osate.ge/src/org/osate/ge/internal/graphiti/AgeImageProvider.java ge/org.osate.ge/src/org/osate/ge/internal/graphiti/ImageFigure.java ge/org.osate.ge/src/org/osate/ge/internal/graphiti/diagram/LabelHelper.java ge/org.osate.ge/src/org/osate/ge/internal/graphiti/features/UpdateDiagramFeature.java ge/org.osate.ge/src/org/osate/ge/internal/graphiti/graphics/AgeGraphitiGraphicsUtil.java ge/org.osate.ge/src/org/osate/ge/internal/graphiti/services/GraphitiService.java ge/org.osate.ge/src/org/osate/ge/internal/graphiti/services/impl/DefaultColoringService.java ge/org.osate.ge/src/org/osate/ge/internal/services/ActionService.java ge/org.osate.ge/src/org/osate/ge/internal/services/DiagramService.java ge/org.osate.ge/src/org/osate/ge/internal/services/EditorProvider.java ge/org.osate.ge/src/org/osate/ge/internal/services/impl/DefaultActionService.java ge/org.osate.ge/src/org/osate/ge/internal/ui/editor/ActivateAgeEditorAction.java ge/org.osate.ge/src/org/osate/ge/internal/ui/editor/actions/ActionStackAction.java ge/org.osate.ge/src/org/osate/ge/internal/ui/editor/actions/RedoAction.java ge/org.osate.ge/src/org/osate/ge/internal/ui/editor/actions/UndoAction.java ge/org.osate.ge/src/org/osate/ge/internal/ui/handlers/HideAllContentsHandler.java ge/org.osate.ge/src/org/osate/ge/internal/ui/handlers/HideContentFilterHandler.java ge/org.osate.ge/src/org/osate/ge/internal/ui/handlers/HideElementHandler.java ge/org.osate.ge/src/org/osate/ge/internal/ui/handlers/ShowElementHandler.java ge/org.osate.ge/src/org/osate/ge/internal/ui/properties/NotePropertySection.java ge/org.osate.ge/src/org/osate/ge/internal/ui/util/EditorUtil.java ge/org.osate.ge/src/org/osate/ge/internal/util/DiagramUtil.java ge/org.osate.ge/src/org/osate/ge/internal/util/NonUndoableToolCommand.java
1183_ge_gef5 Conflicts: core/org.osate.ui/META-INF/MANIFEST.MF ge/org.osate.ge.errormodel.feature/feature.xml ge/org.osate.ge.errormodel.feature/pom.xml ge/org.osate.ge.errormodel/META-INF/MANIFEST.MF ge/org.osate.ge.feature/feature.xml ge/org.osate.ge.feature/pom.xml ge/org.osate.ge/META-INF/MANIFEST.MF ge/org.osate.ge/pom.xml
RyanMcilnay
previously approved these changes
Jun 29, 2021
Contributor
|
@philip-alldredge The enter key is now processed in the test. There seems to be a race condition between typing the text and the enter key event. I get "SensorInter" instead of "SensorInterface" when setting a breakpoint at UiTestUtil line 975. |
Contributor
Author
|
@lwrage okay. I'll look into it. It's probably due to two separate ways of injecting events. I'll look into doing them all the same way. I am working on the issue that causes the issue on the build server. |
Contributor
Author
|
@lwrage do you have any additional concerns that need to be addressed before merging? The tests should reliably pass on all platforms now. |
Contributor
|
I don't have anything else. |
RyanMcilnay
approved these changes
Jul 6, 2021
lwrage
added a commit
that referenced
this pull request
Feb 16, 2022
* GEF/JavaFX version of graphical editor. Co-authored-by: RyanMcilnay <rm0016@uah.edu> Co-authored-by: Lutz Wrage <lutz.wrage@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
New JavaFX/GEF5 based graphical editor
Closes #1183, #1547, #1461, #1186, #1184, #1188