Commit 966f98da authored 4 years ago by Johannes Eder

fixed master merge conflict

Issue-Ref: 3974
Issue-Url: https://af3-developer.fortiss.org/issues/3974



Signed-off-by: Johannes Eder <eder@fortiss.org>

parents 8559fbe8 85c92880

No related branches found

No related tags found

1 merge request!1083969

Hide whitespace changes

Inline Side-by-side

Showing

org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings 13 additions, 12 deletions

...org/fortiss/tooling/base/ui/editor/fx/controller/.ratings
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/CurvedLinkLayoutedContentAnchorangeController.java 21 additions, 15 deletions

...roller/CurvedLinkLayoutedContentAnchorangeController.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/CurvedLinkLayoutedDiagramAnchorangeController.java 87 additions, 0 deletions

...roller/CurvedLinkLayoutedDiagramAnchorangeController.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectDiagramController.java 2 additions, 2 deletions

...ase/ui/editor/fx/controller/EObjectDiagramController.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectEllipticResizableContentControllerBase.java 5 additions, 4 deletions

...roller/EObjectEllipticResizableContentControllerBase.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectRectangularResizableContentControllerBase.java 5 additions, 4 deletions

...ler/EObjectRectangularResizableContentControllerBase.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedContentAnchorageController.java 7 additions, 6 deletions

...tor/fx/controller/LayoutedContentAnchorageController.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedCurveLinkBendPointController.java 2 additions, 1 deletion

...r/fx/controller/LayoutedCurveLinkBendPointController.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedDiagramAnchorageController.java 8 additions, 7 deletions

...tor/fx/controller/LayoutedDiagramAnchorageController.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedEllipticResizableContentController.java 2 additions, 1 deletion

...ontroller/LayoutedEllipticResizableContentController.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedLineLinkBendPointController.java 2 additions, 1 deletion

...or/fx/controller/LayoutedLineLinkBendPointController.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedLinkBendPointController.java 5 additions, 4 deletions

...editor/fx/controller/LayoutedLinkBendPointController.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutedRectangularResizableContentController.java 5 additions, 4 deletions

...roller/LayoutedRectangularResizableContentController.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/NamedCommentedLayoutModelChangeProvider.java 12 additions, 6 deletions

...x/controller/NamedCommentedLayoutModelChangeProvider.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/.ratings 3 additions, 3 deletions

...src/org/fortiss/tooling/base/ui/editor/fx/visual/.ratings
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularAnchorageContentVisualBase.java 1 addition, 1 deletion

...fx/visual/LayoutedCircularAnchorageContentVisualBase.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageContentVisual.java 40 additions, 5 deletions

...x/visual/NamedLayoutedCircularAnchorageContentVisual.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageDiagramVisual.java 40 additions, 5 deletions

...x/visual/NamedLayoutedCircularAnchorageDiagramVisual.java
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/utils/.ratings 1 addition, 1 deletion

...ng.base.ui/src/org/fortiss/tooling/base/ui/utils/.ratings
org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/utils/LWFXEditorUtils.java 44 additions, 1 deletion

...rc/org/fortiss/tooling/base/ui/utils/LWFXEditorUtils.java

with 305 additions and 83 deletions

Please register or to comment