Commit 41906ad5 authored 5 years ago by Johannes Eder

fixed rating conflicts. merged master.

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



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

parents 9a926eb7 825d9242

No related branches found

No related tags found

1 merge request!88[3873] Ellipses and Bezier curves

Hide whitespace changes

Inline Side-by-side

Showing

org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/ContextMenuUtil.java 1 addition, 1 deletion

...tooling/base/ui/editor/fx/controller/ContextMenuUtil.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings 4 additions, 4 deletions

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

...control/treetableview/DynamicTreeContentProviderBase.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeItem.java 4 additions, 3 deletions

...mmon/ui/javafx/control/treetableview/DynamicTreeItem.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableUIProviderBase.java 96 additions, 4 deletions

...control/treetableview/DynamicTreeTableUIProviderBase.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableViewer.java 28 additions, 43 deletions

.../javafx/control/treetableview/DynamicTreeTableViewer.java
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/.ratings 1 addition, 1 deletion

...ui/src/org/fortiss/tooling/common/ui/javafx/util/.ratings
org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/GraphicUtils.java 9 additions, 2 deletions

...g/fortiss/tooling/common/ui/javafx/util/GraphicUtils.java
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/.ratings 2 additions, 2 deletions

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

...iss/tooling/kernel/ui/extension/IModelElementHandler.java
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings 4 additions, 4 deletions

...src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/FXEditorBase.java 44 additions, 1 deletion

...ortiss/tooling/kernel/ui/extension/base/FXEditorBase.java
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/LWFXEFEditorBase.java 1 addition, 31 deletions

...ss/tooling/kernel/ui/extension/base/LWFXEFEditorBase.java
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/ModelElementHandlerBase.java 26 additions, 1 deletion

...ing/kernel/ui/extension/base/ModelElementHandlerBase.java
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/factory/.ratings 3 additions, 3 deletions

...fortiss/tooling/kernel/ui/extension/base/factory/.ratings
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/factory/DelegatingControllerFactory.java 4 additions, 3 deletions

...i/extension/base/factory/DelegatingControllerFactory.java
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/factory/DelegatingModelFactory.java 6 additions, 5 deletions

...nel/ui/extension/base/factory/DelegatingModelFactory.java
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/factory/DelegatingVisualFactory.java 3 additions, 3 deletions

...el/ui/extension/base/factory/DelegatingVisualFactory.java
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings 2 additions, 2 deletions

...el.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java 9 additions, 0 deletions

...ooling/kernel/ui/internal/ModelElementHandlerService.java

with 287 additions and 118 deletions

Please register or to comment