Commits · e54b72f7ca672a98486d6c498340a075635cc7d7 · af3 / AF3

15 Jan, 2020 11 commits
- DSE patterns: Resolve NPE if safety constraints are defined · e54b72f7
  Alexander Diewald authored Jan 15, 2020
```
Issue-Ref: 3885
Issue-Url: https://af3-developer.fortiss.org/issues/3885

Signed-off-by: Alexander Diewald <diewald@fortiss.org>
```
  e54b72f7
- Merge remote-tracking branch 'origin/master' into 3437 · d951f5e8
  Alexander Diewald authored Jan 15, 2020
  
  d951f5e8
- CR: GREEN · 37ff49f2
  Alexander Diewald authored Jan 15, 2020
```
Issue-Ref: 3885
Issue-Url: https://af3-developer.fortiss.org/issues/3885

Signed-off-by: Alexander Diewald <diewald@fortiss.org>
```
  37ff49f2
- DSE-Patterns: Move the NameProvider to a util class · 81063c7c
  Alexander Diewald authored Jan 15, 2020
```
Issue-Ref: 3885
Issue-Url: https://af3-developer.fortiss.org/issues/3885

Signed-off-by: Alexander Diewald <diewald@fortiss.org>
```
  81063c7c
- Extraction of a NamedTreeTableProvider for simple TreeTableView cases · 3491637f
  Marco Volpe authored Jan 15, 2020
```
*

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

Signed-off-by: Marco Volpe <volpe@fortiss.org>
```
  3491637f
- Merge branch '3891' into 'master' · 9f66f781
  Simon Barner authored Jan 15, 2020
```
3891: FOCUSer removal

See merge request af3/af3!272
```
  9f66f781
- Merge remote-tracking branch 'origin/master' into 3437 · a9e83d22
  Marco Volpe authored Jan 15, 2020
  
  a9e83d22
- Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3891 · 4697d685
  Simon Barner authored Jan 15, 2020
  
  4697d685
- Merge branch '3885' into 'master' · 5cfb6b6d
  Alexander Diewald authored Jan 15, 2020
```
[UI] Introduce JavaFX-based editor for OperatorPanel

See merge request af3/af3!265
```
  5cfb6b6d
- CR: GREEN · 1c89e260
  Alexander Diewald authored Jan 15, 2020
```
Issue-Ref: 3885
Issue-Url: https://af3-developer.fortiss.org/issues/3885

Signed-off-by: Alexander Diewald <diewald@fortiss.org>
```
  1c89e260
- Operator panel: Add comment for name label · fe93f0c5
  Alexander Diewald authored Jan 15, 2020
```
Issue-Ref: 3885
Issue-Url: https://af3-developer.fortiss.org/issues/3885

Signed-off-by: Alexander Diewald <diewald@fortiss.org>
```
  fe93f0c5
14 Jan, 2020 1 commit

Marco Volpe authored Jan 14, 2020

* A TODO answered in LabelVisual.java. Left the class YELLOW for the
moment.

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

Signed-off-by: Marco Volpe <volpe@fortiss.org>

9eead76f

13 Jan, 2020 5 commits

GREEN · 77588a10

Simon Barner authored Jan 13, 2020

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

Signed-off-by: Simon Barner <barner@fortiss.org>

77588a10

Remove IFunctionScope interface from Analysis project root element · 6d16cecd

Simon Barner authored Jan 13, 2020

* Fixes exception described in #3891

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

Signed-off-by: Simon Barner <barner@fortiss.org>

6d16cecd

CR: GREEN / RED · 30e7d833

Alexander Diewald authored Jan 13, 2020

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

Signed-off-by: Alexander Diewald <diewald@fortiss.org>

30e7d833

Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3891 · 83f96745

Simon Barner authored Jan 13, 2020



Conflicts:
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/.ratings
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/AF3MiraUIActivator.java
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/constraints/.ratings
	org.fortiss.af3.mira/META-INF/MANIFEST.MF
	org.fortiss.af3.mira/model/mira.ecore
	org.fortiss.af3.mira/model/mira.genmodel
	org.fortiss.af3.mira/plugin.xml
	org.fortiss.af3.mira/src/org/fortiss/af3/mira/.ratings
	org.fortiss.af3.mira/src/org/fortiss/af3/mira/AF3MiraActivator.java
	org.fortiss.af3.mira/src/org/fortiss/af3/mira/utils/.ratings
	org.fortiss.af3.mira/src/org/fortiss/af3/mira/utils/MiraModelElementFactory.java
	org.fortiss.af3.mira/src/org/fortiss/af3/mira/utils/MiraUtils.java
	org.fortiss.af3.project/model/.ratings
	org.fortiss.af3.project/src/org/fortiss/af3/project/utils/.ratings
	org.fortiss.af3.project/src/org/fortiss/af3/project/utils/ProjectModelElementFactory.java
	org.fortiss.af3.safetycases/src/org/fortiss/af3/safetycases/.ratings
Signed-off-by: Simon Barner <barner@fortiss.org>

83f96745

[UI] Add support for generic JavaFX composites and SuperSet providers · 25e96e89

Tiziano Munaro authored Jan 13, 2020

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

Signed-off-by: Tiziano Munaro <munaro@fortiss.org>

25e96e89

10 Jan, 2020 2 commits
- Merge remote-tracking branch 'origin/master' into 3437 · 38870f67
  Tiziano Munaro authored Jan 10, 2020
```
Issue-Ref: 3437
Issue-Url: https://af3-developer.fortiss.org/issues/3437

Signed-off-by: Tiziano Munaro <munaro@fortiss.org>
```
  38870f67
- Merge branch 'master' into 3885 · 94935817
  Marco Volpe authored Jan 10, 2020
  
  94935817
09 Jan, 2020 1 commit

More comments addressed. · 57aa7b38

Marco Volpe authored Jan 09, 2020

* A TODO answered but not really addressed in
AllocationPatternFXController. I keep that class RED for now

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

Signed-off-by: Marco Volpe <volpe@fortiss.org>

57aa7b38

03 Jan, 2020 1 commit

Part of the review comments addressed. · 8a126253

Marco Volpe authored Jan 03, 2020

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

Signed-off-by: Marco Volpe <volpe@fortiss.org>

8a126253

20 Dec, 2019 19 commits

Merge branch '3884' into 'master' · 4e8d62ff

Simon Barner authored Dec 20, 2019

Initial JavaFX-based Partition Architectecture editor

See merge request af3/af3!268

4e8d62ff

Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3884 · e8a30c00
Simon Barner authored Dec 20, 2019

e8a30c00
Merge branch '3886' into 'master' · c9362d0d
Simon Barner authored Dec 20, 2019
```
3886

See merge request af3/af3!270
```
c9362d0d

RED · a78ecb8f

Simon Barner authored Dec 20, 2019

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

Signed-off-by: Simon Barner <barner@fortiss.org>

a78ecb8f

YELLOW · 373ca6bc

Johannes Eder authored Dec 20, 2019

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

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

373ca6bc

GREEN · cbc7101f

Simon Barner authored Dec 20, 2019

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

Signed-off-by: Simon Barner <barner@fortiss.org>

cbc7101f

Merge remote-tracking branch 'origin/master' into 3891 · be9ca546
Johannes Eder authored Dec 20, 2019

be9ca546

GREEN · b7ebaa91

Tiziano Munaro authored Dec 20, 2019

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

Signed-off-by: Tiziano Munaro <munaro@fortiss.org>

b7ebaa91

Merge remote-tracking branch 'origin/master' into 3884 · 73c97ca7
Tiziano Munaro authored Dec 20, 2019

73c97ca7
Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3886 · 0b6a2bcd
Simon Barner authored Dec 20, 2019

0b6a2bcd
Merge branch '3865' into 'master' · 9c20e188
Simon Barner authored Dec 20, 2019
```
3865: Tolerant model loader

See merge request af3/af3!271
```
9c20e188

Merge Master · 9cc0e639

Johannes Eder authored Dec 20, 2019

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

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

9cc0e639

YELLOW · 3743314b

Johannes Eder authored Dec 20, 2019

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

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

3743314b

YELLOW · 26b3bc10

Johannes Eder authored Dec 20, 2019

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

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

26b3bc10

YELLOW · cdc862f1

Johannes Eder authored Dec 20, 2019

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

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

cdc862f1

YELLOW · a6b8aaf6

Johannes Eder authored Dec 20, 2019

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

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

a6b8aaf6

YELLOW · 42cd09dc

Johannes Eder authored Dec 20, 2019

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

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

42cd09dc

Avoid unneeded explicity controller classes · 659e45e7

Simon Barner authored Dec 20, 2019

* Use LayoutedRectangularResizableContentController directly
* TBD: Change default implementation of
       <sf>.lwfxef.controller.base.ControllerBase::allowLink()

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

Signed-off-by: Simon Barner <barner@fortiss.org>

659e45e7

Adapt newly introduced base classes for controllers and visuals · 1158780f

Simon Barner authored Dec 20, 2019

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

Signed-off-by: Simon Barner <barner@fortiss.org>

1158780f