Commits · 6f7b6a42af3530ebde080b97fc561a84f02eafed · af3 / kernel

Aug 13, 2020

Andreas Bayha authored 4 years ago

Resized filter widgets, such that all combo content can be displayed
completely.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

6f7b6a42

DynamicTreetbaleViewer: Cell background color correct under selection · 8fd377a5

Andreas Bayha authored 4 years ago

The background color of cells is always used with 50% transparency such
that the selection bar is displayed correctly, if a row is selected.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

8fd377a5

Aug 11, 2020

Annotations: Fixed minor issues · 158badfa

Andreas Bayha authored 4 years ago

- The Background color for tree table cells was causing problems with
selection.

- The order of annotatinos in the tree was not correct.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

158badfa

Aug 10, 2020

DynmicTreeTable: Changed signature of · 3101d750

Andreas Bayha authored 4 years ago

DynamicTreeTableUIProviderBase.isEditable

New (more consistent) signature: isEditable(int column, AnnotationEntry
element).

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

3101d750

DynamicTreeTable: Changed signature of isElementEditable. · e9a5dded

Andreas Bayha authored 4 years ago

The order of parameters is now (int, T), as in getLabel(...).

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

e9a5dded

Annotations: Background column green for selected element · 4412f924

Andreas Bayha authored 4 years ago

The line with the selected element has a green background.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

4412f924

Annotations: Added background color for non-editable cells · b7937426

Andreas Bayha authored 4 years ago

Enhances DynamicTreeTableViewer such that cell background can easily be
set.

Refactored combo column code to be more generic and reusable.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

b7937426

TreeTableViewer: Added dynamic background color. · 97dd2d1d

Andreas Bayha authored 4 years ago

Added the possibility to dynamically set the background color of each
cell. The UIProvider offers a getBackgroundColor method to this end.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

97dd2d1d

Jul 22, 2020

Annotations: YELLOW · 72d00d76

Andreas Bayha authored 4 years ago

YELLOW

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

72d00d76

Annotations: YELLOW · 3fbca87d

Andreas Bayha authored 4 years ago

YELLOW

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

3fbca87d

Annotations: Improved code · 199c8154

Andreas Bayha authored 4 years ago

- The filter is now better integrated with the content provider.
- Javadoc comments.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

199c8154

Annotations: Merged Master · b66f1288

Andreas Bayha authored 4 years ago

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

b66f1288

Jul 20, 2020

Annotations: Fixed problem with filtering · ecf082db

Andreas Bayha authored 4 years ago

The content provider did not filter, whenever there was an empty filter
expression set.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

ecf082db

Annotations: Clean-up · e79a0a21

Andreas Bayha authored 4 years ago

Refactored code.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

e79a0a21

Jul 17, 2020

Annotations: Added Filter for Rows and Columns · 64982cc9

Andreas Bayha authored 4 years ago

Added filters for model element and column name.
Also the filter for selected element type is implemented.

Hierarchy and annotation type are still pending.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

64982cc9

Jul 15, 2020

Annotations: Updated .fxml of AnnotationView · 3fafdd03

Andreas Bayha authored 4 years ago

Added filter section.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

3fafdd03

Annotations: AnnotationView uses Generic Combo Column · a3e117c4

Andreas Bayha authored 4 years ago

Factored out the combo column to a generic implementation. Now, a
generic implementation for dynamic combo columns is reusable for all
DynamicTreetBaleViewers.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

a3e117c4

Kernel: Added Dynamic Combo Columns for DynamicTreeTableViewer. · 31330cc1

Andreas Bayha authored 4 years ago

There is an addComboColumn(...) method now. The combo columnb is dynamic
in a sense, that every cell/row might have it's own choices for the
combo, depending on the element.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

31330cc1

Annotation: Added DynamicTextFielTreeTableCell · 420f3f21

Andreas Bayha authored 4 years ago

Add a generic TextTreeTableCell with improved functionality:
- canEdit() per element.
- Better canceling behavior when leaving the cell.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

420f3f21

Jul 14, 2020

Annotations: Text Editing for Annotation View works · 19ffabc3

Andreas Bayha authored 4 years ago

Editing textual-based annotation entries in the table works now.
Also unintended cancel operations (e.g. when clicking onto another cell)
are catched and handled correctly.

It remains to make the implementation more genierc to be reusable for
other views.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

19ffabc3

Jul 09, 2020

Annotations: Refactored code · ad1bf893

Andreas Bayha authored 4 years ago

Refactored code of AnnotationViewFXController.
Editing enumerative Annotations works now.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

ad1bf893

Annotations: Editing seams to work · 600d7ba2

Andreas Bayha authored 4 years ago

Editing of Enumeration values seams to work. But wrong value is
displayed, still.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

600d7ba2

Jul 08, 2020

Annotations: First Combobox in Table for Annotations · 255f14e8

Andreas Bayha authored 4 years ago

There is a Combobox in the Annotation Table.
However, it remains to do a more generic implementation independent of
annotations.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

255f14e8

Jul 06, 2020

Kernel: Merged master · 74bfb6ef

Andreas Bayha authored 4 years ago

Merged in Master.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

74bfb6ef

Jun 09, 2020

Annotations: AnnotationFxView table · 8ca82855

Andreas Bayha authored 4 years ago

First Durchstich to display annotations according to the current
selection.

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


Signed-off-by: Andreas Bayha <bayha@fortiss.org>

8ca82855

Jun 02, 2020
- Merge branch '4008' into 'master' · 035376eb
  Alexander Diewald authored 4 years ago
  
  Test case generator for DSE problems See merge request !117
  035376eb
May 29, 2020
- Kernel: GREEN · f0a18f2f
  Marco Volpe authored 4 years ago
  
  Issue-Ref: 4008 Issue-Url: https://af3-developer.fortiss.org/issues/4008 Signed-off-by: Marco Volpe <volpe@fortiss.org>
  f0a18f2f
- Merge remote-tracking branch 'origin/master' into 4008 · 549406ab
  Alexander Diewald authored 4 years ago
  
  549406ab
May 25, 2020
- Merge branch '3994' into 'master' · c1f3be54
  Simon Barner authored 4 years ago
  
  CLI for shutting down the platform See merge request !115
  c1f3be54
May 20, 2020
- Merge remote-tracking branch 'origin/master' into 4008 · 3356e5d3
  Alexander Diewald authored 4 years ago
  
  Conflicts: org.fortiss.tooling.base/src/org/fortiss/tooling/base/utils/.ratings Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  3356e5d3
- Merge remote-tracking branch 'origin/master' into 3994 · 6fa0ea5e
  Alexander Diewald authored 4 years ago
  
  6fa0ea5e
May 19, 2020

Merge branch '3365' into 'master' · b9505765
Alexander Diewald authored 4 years ago
```
Math: Add predicate to identify float objects

See merge request !116
```
b9505765

GREEN · 34f6a293

Johannes Eder authored 4 years ago

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



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

34f6a293

GREEN · 5d44813a

Simon Barner authored 4 years ago

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



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

5d44813a

May 18, 2020

Merge remote-tracking branch 'origin/3365' into 4008 · 31795e91

Alexander Diewald authored 4 years ago


Conflicts:
	org.fortiss.tooling.base/src/org/fortiss/tooling/base/utils/.ratings

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

31795e91

YELLOW: Fix float number type check · f52624fa

Alexander Diewald authored 4 years ago

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


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

f52624fa

RED · 3b5d4a82

Johannes Eder authored 4 years ago

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



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

3b5d4a82

May 15, 2020
- Merge remote-tracking branch 'origin/master' into 3994 · 6829438f
  Alexander Diewald authored 4 years ago
  
  6829438f
- Merge branch '3365' into 4008 · b37c4f0c
  Alexander Diewald authored 4 years ago
  
  Conflicts: org.fortiss.tooling.base/src/org/fortiss/tooling/base/utils/.ratings Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  b37c4f0c
- Math: Add predicate to identify float objects · a087878c
  Alexander Diewald authored 4 years ago
  
  Issue-Ref: 3365 Issue-Url: https://af3-developer.fortiss.org/issues/3365 Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  a087878c