Commits · 2f058898d93c207f33bf6320e20de319ff9321c3 · af3 / AF3

15 Oct, 2019 8 commits

Update OS checks and limit co-simulation features to Windows and Linux · 2f058898

Tiziano Munaro authored Oct 15, 2019

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



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

2f058898

Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3847 · 15c8019d
Simon Barner authored Oct 15, 2019

15c8019d

CR: GREEN / RED · 346e987e

Simon Barner authored Oct 15, 2019

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



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

346e987e

GREEN · e7f876cd

Tiziano Munaro authored Oct 15, 2019

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



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

e7f876cd

Merge branch '3847' of https://git.fortiss.org/af3/af3.git into 3847 · 910492a5
Tiziano Munaro authored Oct 15, 2019

910492a5

Fix export and co-simulation of FMUs in binary product · 804ab305

Tiziano Munaro authored Oct 15, 2019

* Include the COE-server as resource
* Include all libraries and resource folders in the build path
* Export packages as unpacked directories (instead of as JARs)

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



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

804ab305

Version bump to 2.16.0 · 04db574e
Alexander Diewald authored Oct 15, 2019
```
Issue-Ref: 3852
Signed-off-by: Alexander Diewald <diewald@fortiss.org>
```
04db574e

Remove forgotten debug sysout · 12e39019

Simon Barner authored Oct 15, 2019

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



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

12e39019

14 Oct, 2019 7 commits

Add templates to binary build · 8e900dad

Simon Barner authored Oct 14, 2019

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



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

8e900dad

fmuArchiveToTopCEntry(): Do not eat IOException · 6dc816ec

Simon Barner authored Oct 14, 2019

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



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

6dc816ec

getStartupFailureMessage(): try harder to get an exception message · b92a373b

Simon Barner authored Oct 14, 2019

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



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

b92a373b

GREEN · 1cd0c7ea

Simon Barner authored Oct 14, 2019

* Reviewed by Munaro

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



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

1cd0c7ea

co-sim.ui: Add lib and icons to binary build · ed57d976

Simon Barner authored Oct 14, 2019

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



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

ed57d976

Merge branch '3829' into 'master' · 184064d5
Alexander Diewald authored Oct 14, 2019
```
DSE: Disable external model importer

See merge request af3/af3!254
```
184064d5

DSE: Disable external model importer · b1095879

Alexander Diewald authored Oct 14, 2019

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


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

b1095879

11 Oct, 2019 6 commits

Merge branch '3841' into 'master' · e266650e

Simon Barner authored Oct 11, 2019

Generate an exception in case no period has been defined

See merge request af3/af3!253

e266650e

GREEN · 488c8a7f

Simon Barner authored Oct 11, 2019

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



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

488c8a7f

Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3841 · 00e2f32d
Simon Barner authored Oct 11, 2019

00e2f32d

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

MessageUtilsExtended.askQuestion() -> askQuestionInUIThread() · 7881c76f

Simon Barner authored Oct 11, 2019

* Fix infinite recursion caused by erroneous static import of
  MessageUtils.askQuestion()

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



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

7881c76f

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