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/src/org/fortiss/tooling/base/compose/.ratings 2 additions, 3 deletions

...ooling.base/src/org/fortiss/tooling/base/compose/.ratings
org.fortiss.tooling.base/src/org/fortiss/tooling/base/compose/HierarchicElementCompositorBase.java 0 additions, 6 deletions

...tooling/base/compose/HierarchicElementCompositorBase.java
org.fortiss.tooling.base/src/org/fortiss/tooling/base/compose/ModelElementCompositorBase.java 0 additions, 11 deletions

...tiss/tooling/base/compose/ModelElementCompositorBase.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings 1 addition, 1 deletion

...s/tooling/common/ui/javafx/control/treetableview/.ratings
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableUIProviderBase.java 85 additions, 5 deletions

...control/treetableview/DynamicTreeTableUIProviderBase.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/DiagramViewer.java 2 additions, 2 deletions

...ortiss/tooling/common/ui/javafx/lwfxef/DiagramViewer.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/MVCBundleManager.java 1 addition, 1 deletion

...iss/tooling/common/ui/javafx/lwfxef/MVCBundleManager.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/.ratings 1 addition, 1 deletion

...rtiss/tooling/common/ui/javafx/lwfxef/controller/.ratings
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/IController.java 1 addition, 1 deletion

...oling/common/ui/javafx/lwfxef/controller/IController.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings 3 additions, 3 deletions

.../tooling/common/ui/javafx/lwfxef/controller/base/.ratings
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/ControllerBase.java 3 additions, 3 deletions

...mmon/ui/javafx/lwfxef/controller/base/ControllerBase.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DelegatingContentAnchorageController.java 57 additions, 0 deletions

...controller/base/DelegatingContentAnchorageController.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/LinkControllerBase.java 2 additions, 6 deletions

.../ui/javafx/lwfxef/controller/base/LinkControllerBase.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/elliptic/.ratings 1 addition, 1 deletion

...ling/common/ui/javafx/lwfxef/controller/elliptic/.ratings
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/elliptic/EllipticResizableContentControllerBase.java 1 addition, 1 deletion

...ller/elliptic/EllipticResizableContentControllerBase.java
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings 1 addition, 1 deletion

...src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/LWFXEFEditorBase.java 5 additions, 0 deletions

...ss/tooling/kernel/ui/extension/base/LWFXEFEditorBase.java
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings 1 addition, 1 deletion

...kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/CopyPasteUtils.java 0 additions, 11 deletions

...rc/org/fortiss/tooling/kernel/ui/util/CopyPasteUtils.java
org.fortiss.tooling.kernel/META-INF/MANIFEST.MF 0 additions, 3 deletions

org.fortiss.tooling.kernel/META-INF/MANIFEST.MF

with 167 additions and 61 deletions

Please register or to comment