Commits · 3edc2ae69f760a4b29926ea1657184fadbf55966 · af3 / AF3

11 Oct, 2019 2 commits

Generate an exception in case no period has been defined · 3edc2ae6

Marco Volpe authored Oct 11, 2019

* Add and return a message to the user

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



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

3edc2ae6

Merge branch '3840' into 'master' · d3ab8a59
Simon Barner authored Oct 11, 2019
```
3840: Constraint/Objective wizard height

See merge request af3/af3!252
```
d3ab8a59

10 Oct, 2019 7 commits

GREEN with minor changes · 353a6cac

Tiziano Munaro authored Oct 10, 2019

* Rename 'ModifySubSetWizard' fixing a typo
* Fix default name for rule sets

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



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

353a6cac

createRuleSet(): Fix order of arguments · edb782c0

Simon Barner authored Oct 10, 2019

* author and comment were swapped

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



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

edb782c0

Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3840 · 6083e35c
Simon Barner authored Oct 10, 2019

6083e35c

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 9 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

Merge branch '3835' into 'master' · 501b36e3
Alexander Diewald authored Oct 09, 2019
```
3835: Load DSE help from org.fortiss.af3.rcp.help

See merge request af3/af3!251
```
501b36e3

CR: GREEN · aab487e7

Alexander Diewald authored Oct 09, 2019

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


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

aab487e7

Manifest: Reexport all, do not specify minimum version · 8071d9cb

Alexander Diewald authored Oct 09, 2019

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


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

8071d9cb

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 12 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

Load DSE help from org.fortiss.af3.rcp.help · 57aaacde

Simon Barner authored Oct 08, 2019

* Storing DSE help in the same plugin as the rest of the AF3 help
  fixes broken link in the Eclipse help browser and the web version
  of the online help
* Improve error handling

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



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

57aaacde

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 1 commit

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