Commits · 5501642b2a53a9292994752584317590c3185857 · af3 / AF3

10 Oct, 2019 4 commits

Fix cancelling to edit a RuleSet · 5501642b

Simon Barner authored Oct 10, 2019

* Write data to the model on "Finish" of the wizard
* Prevent removing all constraints from a RuleSet

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


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

5501642b

Enforce "Create constraint" before "Finish" · ac2dcba8

Simon Barner authored Oct 10, 2019

* Cannot "Finish" without "Create Constraint" if at least one constraint
  is checked
* "Create Constraint" button is disabled if no constraint is selected

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


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

ac2dcba8

Enable editing author, name, and comment of RuleSet · a10f9688

Simon Barner authored Oct 10, 2019

* Make Text fields of ConstraintSetWizardPageGUI private and offer
  setRuleSet() instead
* ModifySubSetWizard
   * Store original RuleSet name, author, comment
   * Update model on "Finish" if needed
   * Update RuleSet editor UI and DSE navigator (via EventBroker)

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


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

a10f9688

Define helper methods to obtain RuleSet name, author, and comment · d258da9c

Simon Barner authored Oct 10, 2019

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


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

d258da9c

09 Oct, 2019 6 commits

Fix removal of rule sets · 18d8d4c2

Simon Barner authored Oct 09, 2019

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


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

18d8d4c2

GREEN · 743c9a10

Tiziano Munaro authored Oct 09, 2019

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



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

743c9a10

Use MessageUtilsExtended for error and question dialogs · 60585212

Simon Barner authored Oct 09, 2019

* Avoids creation of temporary SWT Shells that on Linux result into
  a spurious (gray) window to be displayed behind the dialog
* Remove DSESelectionAdapter. Preserving the error flag in a protected
  field is potentially dangerous. Moreover, the value was not actually
  used.

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


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

60585212

Fix editing of constraint/objective set · 64b7ddf0

Simon Barner authored Oct 09, 2019

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


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

64b7ddf0

Center ConstraintSetWizard; Center and set size of ModifiySubSetWizard · 1811a03a

Simon Barner authored Oct 09, 2019

* Introduce method showWizardDialog()

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


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

1811a03a

GREEN · c74970f3

Tiziano Munaro authored Oct 09, 2019

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



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

c74970f3

08 Oct, 2019 11 commits

Constraint/Objective Set Wizard: Beautify some strings · e5a111ea

Simon Barner authored Oct 08, 2019

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



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

e5a111ea

Set default width of Constraint/Objective set wizard · c25ef198

Simon Barner authored Oct 08, 2019

* Ensure that "Create a new Constraint/Objective Set button" is visible
  when the wizard is started

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



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

c25ef198

Merge branch '3821' into 'master' · c5593370
Alexander Diewald authored Oct 08, 2019
```
MessageSize handler modified

See merge request af3/af3!237
```
c5593370

GREEN · 47172f9a

Tiziano Munaro authored Oct 08, 2019

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



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

47172f9a

Msg-Size: Correctly register MessageSize migrator · f381e88b

Alexander Diewald authored Oct 08, 2019

* Results from a mismerge.
* The migrator must be registered for the  FileProject to capture
  both Platform and TaskArchitectures.

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


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

f381e88b

SMT-Transformation: Get MessageSizes the standard way · 446c6ba8

Alexander Diewald authored Oct 08, 2019

A complete implementation is reserved for ticket #3689

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


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

446c6ba8

DSE-Tests: Migrate models to the latest version · 974361c2

Alexander Diewald authored Oct 08, 2019

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


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

974361c2

DSE-Tests: Remove outdated models · 6750bb0a

Alexander Diewald authored Oct 08, 2019

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


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

6750bb0a

Merge remote-tracking branch 'origin/master' into 3821 · ef3f5bb2
Alexander Diewald authored Oct 08, 2019

ef3f5bb2

GREEN · 2a9a1b99

Tiziano Munaro authored Oct 08, 2019

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



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

2a9a1b99

Merge branch '3829' into 'master' · 392e2874
Simon Barner authored Oct 08, 2019
```
3829

See merge request af3/af3!250
```
392e2874

07 Oct, 2019 7 commits

Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3829 · bd236605
Simon Barner authored Oct 07, 2019

bd236605
Merge branch '3534' into 'master' · 532fce34
Alexander Diewald authored Oct 07, 2019
```
3534: Platform.Hierarchic.UI Developer Documentation

See merge request af3/af3!249
```
532fce34

CR: GREEN · f3576be9

Alexander Diewald authored Oct 07, 2019

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


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

f3576be9

Merge remote-tracking branch 'origin/master' into 3534 · 7194113c
Alexander Diewald authored Oct 07, 2019

7194113c
MessageSize: Fix mismerge · 4a328eea
Alexander Diewald authored Oct 07, 2019
```
Signed-off-by: Alexander Diewald <diewald@fortiss.org>
```
4a328eea

YELLOW · 84a30211

Alexander Diewald authored Oct 07, 2019



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

84a30211

Merge remote-tracking branch 'origin/master' into 3821 · a48cf82e

Alexander Diewald authored Oct 07, 2019



Conflicts:
	org.fortiss.af3.platform/model/.ratings
	org.fortiss.af3.platform/plugin.xml
	org.fortiss.af3.platform/src/org/fortiss/af3/platform/annotation/valueprovider/.ratings
	org.fortiss.af3.platform/src/org/fortiss/af3/platform/annotation/valueprovider/MessageSizeValueProvider.java
	org.fortiss.af3.platform/src/org/fortiss/af3/platform/model/allocation/impl/.ratings


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

a48cf82e

06 Oct, 2019 2 commits

Small changes. · c2f4da8b

Marco Volpe authored Oct 07, 2019

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



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

c2f4da8b

Updated user-documentation for DSE. · a9c45fd5

Marco Volpe authored Oct 07, 2019

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



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

a9c45fd5

04 Oct, 2019 5 commits
- Merge branch '3651' into 'master' · 20a52ce6
  Simon Barner authored Oct 04, 2019
```
Check that arguments are not null before forming the new expression

See merge request af3/af3!248
```
  20a52ce6
- GREEN · 7d1c971b
  Simon Barner authored Oct 04, 2019
```
Issue-Ref: 3651
Issue-Url: https://af3-developer.fortiss.org/issues/3651



Signed-off-by: Simon Barner <barner@fortiss.org>
```
  7d1c971b
- AFVC::verify(): raise error when concrete verification returns null · 66840150
  Simon Barner authored Oct 04, 2019
```
Issue-Ref: 3651
Issue-Url: https://af3-developer.fortiss.org/issues/3651



Signed-off-by: Simon Barner <barner@fortiss.org>
```
  66840150
- RuntimeException do not have to be declared in the method signature · ea882dc4
  Simon Barner authored Oct 04, 2019
```
Issue-Ref: 3651
Issue-Url: https://af3-developer.fortiss.org/issues/3651



Signed-off-by: Simon Barner <barner@fortiss.org>
```
  ea882dc4
- Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3651 · 077fe424
  Simon Barner authored Oct 04, 2019
  
  077fe424
02 Oct, 2019 5 commits

Move "Arch Characteristics" tab down -> "General" is again the default · 011ead3d

Simon Barner authored Oct 02, 2019

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



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

011ead3d

Move ExecutionUnitFigure to editpart.generic.figure (used only there) · 91bd10e0

Simon Barner authored Oct 02, 2019

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



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

91bd10e0

Developer documentation for platform.ui · 69b064d4

Simon Barner authored Oct 02, 2019

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



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

69b064d4

Developer documentation for platform.hierarchic · fad4cb61

Simon Barner authored Oct 02, 2019

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



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

fad4cb61

Add developer documentation for platform.hierarchic.ui · 9612a76e

Simon Barner authored Oct 02, 2019

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



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

9612a76e