simantics/platform.git
2 months agoMerge "Counting of pending nodes does not work if null text is saved as """
Tuukka Lehtonen [Tue, 26 May 2020 10:33:48 +0000 (10:33 +0000)]
Merge "Counting of pending nodes does not work if null text is saved as """

2 months agoUse element transform when doing pick check 45/4245/1
Marko Luukkainen [Wed, 20 May 2020 13:47:51 +0000 (16:47 +0300)]
Use element transform when doing pick check

gitlab #537

Change-Id: I5fc0d21ce99daca3aa0db210f86382db74fba155
(cherry picked from commit 995f91f4eb4feac37fbee766fb2b16f8d919c5e3)

2 months agoCounting of pending nodes does not work if null text is saved as "" 53/4253/1
Jussi Koskela [Wed, 20 May 2020 05:15:42 +0000 (08:15 +0300)]
Counting of pending nodes does not work if null text is saved as ""

gitlab #535

Change-Id: Ia4e8a0389659ce115d9cfb8febc23be0061fe3be

2 months agoFix change comparison expressions in mapping rules 44/4244/1
Reino Ruusu [Tue, 19 May 2020 11:01:21 +0000 (14:01 +0300)]
Fix change comparison expressions in mapping rules

gitlab #534

Change-Id: Ib82f78be739e172b77c0499f034b8180ecc9e779
(cherry picked from commit ef0aeadaa15a3655c7f2a3b4377ad62b26e186e3)

2 months agoHandle all AttributeRelation properties 22/4222/1
Antti Villberg [Sun, 10 May 2020 07:26:37 +0000 (10:26 +0300)]
Handle all AttributeRelation properties

gitlab #128

Change-Id: I62926e825fdef2e6ccced6805cac1e13012c0d3b

3 months agoFix GetComponentLocation to work with procedural UC instances 20/4220/1
Tuukka Lehtonen [Thu, 7 May 2020 20:32:43 +0000 (23:32 +0300)]
Fix GetComponentLocation to work with procedural UC instances

Previously it would return ComponentLocation.isInsideStructure = false
for Variables representing the insides of a procedural UC instance.

gitlab #532

Change-Id: I26ae30c8e4217e7c4cde03b884604ee59aa7e85b

3 months agoReplace scheduleAtFixedRate with scheduleWithFixedDelay 19/4219/1
Tuukka Lehtonen [Thu, 7 May 2020 20:29:12 +0000 (23:29 +0300)]
Replace scheduleAtFixedRate with scheduleWithFixedDelay

ScheduledExecutorService.scheduleAtFixedRate tends to run enormous
amounts of runnables that would have been scheduled during a machine is
in sleep, after the machines wakes up from sleep, retroactively.

This is not good and can be avoided by using scheduleWithFixedDelay
which is usually good enough regarding the delay between executions.

gitlab #531

Change-Id: I4ac3b11f1f9236d411debb352fce610c33410659

3 months agoInclude org.simantics.graphfile.ui{,.ontology} in org.simantics.platform.ui feature
Tuukka Lehtonen [Tue, 5 May 2020 12:49:49 +0000 (15:49 +0300)]
Include org.simantics.graphfile.ui{,.ontology} in org.simantics.platform.ui feature

gitlab #516

Change-Id: I8860d684ee67c86159cb7e5fa33c6a061e0efc7a

3 months agoFixed CSVFormatter mind floating point inaccuracy when resampling
Tuukka Lehtonen [Wed, 29 Apr 2020 21:55:09 +0000 (00:55 +0300)]
Fixed CSVFormatter mind floating point inaccuracy when resampling

These changes prevent the resampling export mode from dropping samples
that have timestamps closer than 1e-13 sec to the last exported sample
time stamp.

gitlab #529

3 months agoDocument recommended Eclipse IDE setup in root README.md
Tuukka Lehtonen [Wed, 29 Apr 2020 20:48:51 +0000 (23:48 +0300)]
Document recommended Eclipse IDE setup in root README.md

gitlab #524

Change-Id: I27a3596169117f5a32c522089de5bc394b0ea557

3 months agoFixed subscription item data file searching to use groupItemId as well 95/4195/1
Tuukka Lehtonen [Tue, 28 Apr 2020 08:49:44 +0000 (11:49 +0300)]
Fixed subscription item data file searching to use groupItemId as well

This fixes problems where subscription item data CSV export used the
wrong data files to read the data related to the subscription item
because it wasn't matching the data file based on both groupItemId
(subscription item GUID name) and variable ID, which can be overlapping
if a new subscription item is created for a variable that has had a
previous subscription.

gitlab #528

Change-Id: If1ddef78e4b152cf6721f82afc21b37ec5fbb074

3 months agoMerge "Use RuntimeEnvironmentRequest2 where applicable"
Tuukka Lehtonen [Tue, 28 Apr 2020 07:28:15 +0000 (07:28 +0000)]
Merge "Use RuntimeEnvironmentRequest2 where applicable"

3 months agoRemoved settings.xml as unnecessary.
Tuukka Lehtonen [Mon, 27 Apr 2020 17:13:22 +0000 (20:13 +0300)]
Removed settings.xml as unnecessary.

Change-Id: I7192aa6186a0f6cc5e304a25d9450db6e99bd65f

3 months agoUse RuntimeEnvironmentRequest2 where applicable 94/4194/2
Tuukka Lehtonen [Sun, 26 Apr 2020 20:21:09 +0000 (23:21 +0300)]
Use RuntimeEnvironmentRequest2 where applicable

This allows e.g. procedural user component substructure expressions to
use SCL functionality included by the user component's local SCL modules
instead of only having to rely on functionality included by the SCLMain
at the containing index root.

gitlab #527

Change-Id: I7bcb22910737851771f2be54aafecd7480d1c81b

3 months agoUC SCL script/procedural code editors respect L0.readOnly
Tuukka Lehtonen [Fri, 24 Apr 2020 17:34:14 +0000 (20:34 +0300)]
UC SCL script/procedural code editors respect L0.readOnly

Marking the input resource with L0.readOnly now makes the editors
consider the input immutable in the document provider.

gitlab #526

3 months agoStructuralUtils.isImmutable now takes L0.readOnly of input into account
Tuukka Lehtonen [Fri, 24 Apr 2020 17:09:02 +0000 (20:09 +0300)]
StructuralUtils.isImmutable now takes L0.readOnly of input into account

Introduced new utility method Layer0Utils.isMarkedReadOnly for easy
checking L0.readOnly value of a Resource.

gitlab #525

3 months agoMove platform to only work with JDK's >= 11 52/4152/8
Tuukka Lehtonen [Mon, 20 Apr 2020 10:27:48 +0000 (13:27 +0300)]
Move platform to only work with JDK's >= 11

* Several javax-prefixed packages are being removed from JDK (such as
javax.xml.bind) and one has to provide javax.packages via new
jakarta-bundles. See: http://openjdk.java.net/jeps/320#Java-EE-modules

Java 11 is LTS and we don't want to require anything beyond that at this
point. Next LTS will be 17 which will be the next target.

Classes are also now compiled for Java 11.

gitlab #486
gitlab #524

Change-Id: Ib2edf9401ada203412569fadef4f092344b1c553

3 months agoAdd missing influxdb-client-core to target platform 62/4162/2
jsimomaa [Mon, 20 Apr 2020 07:11:10 +0000 (10:11 +0300)]
Add missing influxdb-client-core to target platform

gitlab #523

Change-Id: Ic8135cd8deb353baad8eae64971033bb11e9577b

3 months agoRemoved ALT+SHIFT+Q S shortcut for opening SCL Console 24/4124/1
Tuukka Lehtonen [Fri, 17 Apr 2020 22:05:13 +0000 (01:05 +0300)]
Removed ALT+SHIFT+Q S shortcut for opening SCL Console

It collides with a built-in shortcut that opens the Search view.

gitlab #521

Change-Id: Ic9aa1b2043ba013e44cade62d3fd5306a3a5f9d8
(cherry picked from commit 9d26073293397701d9de90ccd81f766314e06769)

3 months agoJersey package imports are optional, update target platform 57/4157/2
jsimomaa [Fri, 17 Apr 2020 08:04:07 +0000 (11:04 +0300)]
Jersey package imports are optional, update target platform

gitlab #486

Change-Id: I936f507570644457fd8ac7092bdacd0b0077693c

3 months agoDo not require bundles in jersey but make package imports optional 56/4156/2
jsimomaa [Thu, 16 Apr 2020 23:04:28 +0000 (02:04 +0300)]
Do not require bundles in jersey but make package imports optional

gitlab #486

Change-Id: I2ed718fe7fdd94152677db2aae688a1cb46d9247

3 months agojakarta.activation-api imports package `com.sun.activation` 55/4155/2
jsimomaa [Thu, 16 Apr 2020 22:02:15 +0000 (01:02 +0300)]
jakarta.activation-api imports package `com.sun.activation`

* This import shall be made optional as jakarta has taken over EE

gitlab #486

Change-Id: I4114e83cfab287196a4422feb124b5a8f6e85f91

3 months agoJersey bundles require jakarta.activation-api to work 54/4154/2
jsimomaa [Thu, 16 Apr 2020 21:09:22 +0000 (00:09 +0300)]
Jersey bundles require jakarta.activation-api to work

(Forgot to increment bundle version)

gitlab #486

Change-Id: I058ddf6f1139ebcff2a6660c920830c416921046

3 months agoJersey bundles require jakarta.activation-api to work 53/4153/2
jsimomaa [Thu, 16 Apr 2020 20:47:46 +0000 (23:47 +0300)]
Jersey bundles require jakarta.activation-api to work

gitlab #486

Change-Id: I889cce9c365f9f3b158fdc230aa66a213b6e39a4

3 months agoAdd jersey-hk2 bundle to target platforms 51/4151/1
jsimomaa [Thu, 16 Apr 2020 13:51:41 +0000 (16:51 +0300)]
Add jersey-hk2 bundle to target platforms

* Also using relative paths for `.tpd` inclusions for more convenient
target platform updates

gitlab #486

Change-Id: I186d4dade09e6e29a9fda5da4152e31ec8557e1a

3 months agoMerge "Improvements to styling of connection lines"
Tuukka Lehtonen [Thu, 16 Apr 2020 13:46:58 +0000 (13:46 +0000)]
Merge "Improvements to styling of connection lines"

3 months agoAdd missing jersey-hk2 bundle for InjectionManagerFactory implementation 50/4150/1
jsimomaa [Thu, 16 Apr 2020 13:37:53 +0000 (16:37 +0300)]
Add missing jersey-hk2 bundle for InjectionManagerFactory implementation

gitlab #486

Change-Id: Ice1a459bda550f19fec2e8b37d065baa9d1165d4

3 months agoMerge "SimanticsExcel interface refresh"
Tuukka Lehtonen [Thu, 16 Apr 2020 13:24:04 +0000 (13:24 +0000)]
Merge "SimanticsExcel interface refresh"

3 months agoSimanticsExcel interface refresh 49/4149/1
Antti Villberg [Mon, 6 Apr 2020 13:53:28 +0000 (16:53 +0300)]
SimanticsExcel interface refresh

gitlab #514

Change-Id: I9c205730f0cbfb8d75f88c69483155dd8cafd4b2

3 months agoAPIs for skipping state restoration for non-undo synchronization events 48/4148/2
Reino Ruusu [Thu, 16 Apr 2020 10:11:53 +0000 (13:11 +0300)]
APIs for skipping state restoration for non-undo synchronization events

gitlab #520

Change-Id: I50491d4b514db05b8854bcbefff58e7bb9c3b13e

3 months agoUpdate simantics target definitions with updated jersey bundles 46/4146/1
jsimomaa [Thu, 16 Apr 2020 09:24:40 +0000 (12:24 +0300)]
Update simantics target definitions with updated jersey bundles

gitlab #486

Change-Id: I029957cc0c6041be5afa63d192b0a638e0bf3175

3 months agoMerge "Add missing javax.servlet-api bundle requirement for jersey bundles"
Jani Simomaa [Thu, 16 Apr 2020 08:55:47 +0000 (08:55 +0000)]
Merge "Add missing javax.servlet-api bundle requirement for jersey bundles"

3 months agoAdd missing javax.servlet-api bundle requirement for jersey bundles 44/4144/1
jsimomaa [Thu, 16 Apr 2020 08:47:55 +0000 (11:47 +0300)]
Add missing javax.servlet-api bundle requirement for jersey bundles

gitlab #486

Change-Id: I0f1bffdfd5c404477d92ea895766f7d2e3a57fd7

3 months agoImprovements to styling of connection lines 38/4138/1
Jussi Koskela [Tue, 14 Apr 2020 09:41:45 +0000 (12:41 +0300)]
Improvements to styling of connection lines

gitlab #519

Change-Id: Ic08546e5aab985d6e4c365dc9877a692829b0ab2

3 months agoTake rounding field into account in equals and in hashCode 37/4137/1
Jussi Koskela [Tue, 14 Apr 2020 07:46:57 +0000 (10:46 +0300)]
Take rounding field into account in equals and in hashCode

gitlab #518

Change-Id: If96bc1da15494a6041473ee919a074bf997e2455

3 months agoRound corners between non-axis-aligned connection lines properly 36/4136/1
Jussi Koskela [Tue, 14 Apr 2020 07:37:42 +0000 (10:37 +0300)]
Round corners between non-axis-aligned connection lines properly

gitlab #517

Change-Id: I8eb1fba0ecf419834f9a830bbe2aa0fb0e8d21fd

3 months agoMove some GraphFile UI from Simupedia to platform 12/4112/3
Antti Villberg [Sat, 11 Apr 2020 17:08:19 +0000 (20:08 +0300)]
Move some GraphFile UI from Simupedia to platform

gitlab #516

Change-Id: I01793863c377c7a44ca4cf5938e850f7d91e154c

3 months agoMerge "Configurable connection crossing styles"
Tuukka Lehtonen [Fri, 10 Apr 2020 18:07:37 +0000 (18:07 +0000)]
Merge "Configurable connection crossing styles"

3 months agoExport did not manage case differences (mode vs. Mode) 11/4111/1
Antti Villberg [Fri, 10 Apr 2020 17:18:53 +0000 (20:18 +0300)]
Export did not manage case differences (mode vs. Mode)

gitlab #452

Change-Id: I8d4d8908c2dc14ac50c0d7544f7886317689098e

4 months agoConfigurable connection crossing styles 06/4106/2
Jussi Koskela [Tue, 7 Apr 2020 09:26:23 +0000 (12:26 +0300)]
Configurable connection crossing styles

gitlab #515

Change-Id: I859ce915743c13c37be9ca13cdb0c71a2f077d87

4 months agoMerge "Revert "Prime SCL BindingRegistry to shave ~0.5s from startup""
Tuukka Lehtonen [Tue, 7 Apr 2020 09:00:26 +0000 (09:00 +0000)]
Merge "Revert "Prime SCL BindingRegistry to shave ~0.5s from startup""

4 months agoRevert "Prime SCL BindingRegistry to shave ~0.5s from startup" 14/4114/2
Tuukka Lehtonen [Tue, 7 Apr 2020 08:47:50 +0000 (08:47 +0000)]
Revert "Prime SCL BindingRegistry to shave ~0.5s from startup"

This reverts commit 8f99af83cee60676d80cf2334177ab94f82b7959.

Reason for revert: Breaks selection view and other aspects about systems using Variables

gitlab #491

Change-Id: I15003096cd13d738870278dd0c922bd9d0ed4ef5

4 months agoMerge "All tgs do not reference L0.ConsistsOf and L0.HasName"
Tuukka Lehtonen [Mon, 6 Apr 2020 19:56:13 +0000 (19:56 +0000)]
Merge "All tgs do not reference L0.ConsistsOf and L0.HasName"

4 months agoHandle SelectionOutline interface implementation in SCLScenegraph 72/4072/1
Marko Luukkainen [Mon, 6 Apr 2020 13:40:26 +0000 (16:40 +0300)]
Handle SelectionOutline interface implementation in SCLScenegraph

Created custom SelectionShapeNode class for outline highlights, so that
SCLScenegraph can process outline as selection.

Change-Id: Ieeaa47618a8c94f07d9b482c9a3d77044852f2ba
(cherry picked from commit 37c78d83578e57c8bb858d51591446994405b617)

4 months agoAll tgs do not reference L0.ConsistsOf and L0.HasName 03/4103/1
Antti Villberg [Mon, 6 Apr 2020 13:49:44 +0000 (16:49 +0300)]
All tgs do not reference L0.ConsistsOf and L0.HasName

gitlab #422

Change-Id: Ie4a5bae2d1f05b6787a38e376cb827610ed975cd

4 months agoMerge "QueryListening sync is slow"
Tuukka Lehtonen [Mon, 6 Apr 2020 10:24:32 +0000 (10:24 +0000)]
Merge "QueryListening sync is slow"

4 months agoQueryListening sync is slow 36/4036/5
Antti Villberg [Sat, 21 Mar 2020 18:56:50 +0000 (20:56 +0200)]
QueryListening sync is slow

gitlab #503

Change-Id: Ied3aaf386094c3d52b3840d000fb9de01c9ebd03

4 months agoMerge "Support pending values in NodeManager"
Tuukka Lehtonen [Mon, 6 Apr 2020 09:12:09 +0000 (09:12 +0000)]
Merge "Support pending values in NodeManager"

4 months agoSupport pending values in NodeManager 94/4094/2
Antti Villberg [Sun, 5 Apr 2020 13:43:55 +0000 (16:43 +0300)]
Support pending values in NodeManager

gitlab #511

Change-Id: I75b309dffe494d552c442c65e672cc62c3c334ad

4 months agoSpecial RuntimeException to emulate checked exceptions in SCL functions 95/4095/1
Antti Villberg [Sun, 5 Apr 2020 13:48:52 +0000 (16:48 +0300)]
Special RuntimeException to emulate checked exceptions in SCL functions

gitlab #512

Change-Id: Ifd787d23aa263fcb6ca8f59c0f957a891cdd2e15

4 months agoExceptions for many functional objects are broken 89/4089/3
Antti Villberg [Fri, 3 Apr 2020 12:53:16 +0000 (15:53 +0300)]
Exceptions for many functional objects are broken

gitlab #510

Change-Id: Id79a72ad4cf73a2e27351612d05721d6333d2941
(cherry picked from commit 5485802a9eee47cf47e50ef2e96da843417133e5)

4 months agoImproved element reordering performance 87/4087/1
Jussi Koskela [Thu, 2 Apr 2020 11:01:04 +0000 (14:01 +0300)]
Improved element reordering performance

Performance was especially poor when moving element from top to bottom
as it caused changes all elements in the ordered set.

gitlab #508

Change-Id: I140bf8ad552f06477751842f6e3da9e0d294e247

4 months agoFixed moving elements up/down on diagram 86/4086/1
Jussi Koskela [Thu, 2 Apr 2020 10:55:21 +0000 (13:55 +0300)]
Fixed moving elements up/down on diagram

gitlab #509

Change-Id: I47ab51cb5ff07499ed0637e9f7012ec16c5ae7a7

4 months agoFixed the order of shear x and shear y elements 83/4083/1
Jussi Koskela [Tue, 31 Mar 2020 06:47:04 +0000 (09:47 +0300)]
Fixed the order of shear x and shear y elements

gitlab #507

Change-Id: Id055e482465eaf0d65292df0cbedbba5b1e318f8

4 months agoFixed InvertBasicExpressionVisitor bugs with subtractions and divisions 82/4082/1
Tuukka Lehtonen [Mon, 30 Mar 2020 22:13:59 +0000 (01:13 +0300)]
Fixed InvertBasicExpressionVisitor bugs with subtractions and divisions

Minus expressions and divisions were both computed the wrong way around,
i.e. a-b as b-a and a/b as b/a.

Consolidated duplicate InvertBasicExpressionVisitor code into single
base class.

Also noticed that the basicexpression parser doesn't parse e.g. `a*5/4`
but parses `a*5 / 4` just fine. Didn't dive into these parser problems
for now. Hopefully we can retire this code entirely at some point in
favor of SCL expressions.

gitlab #505

Change-Id: I74eaeae1dbec080a10ffc43c0c321705c0b0ea86

4 months agoExpose proxied subject in GroupProxySymbolItem 60/4060/1
Jussi Koskela [Mon, 30 Mar 2020 12:37:18 +0000 (15:37 +0300)]
Expose proxied subject in GroupProxySymbolItem

gitlab #506

Change-Id: Ia7a3c6a10e901aba3b22d91e28b7a018ba448373
(cherry picked from commit 7e2af4ac725e0f663f0598f8c85a0896618bd237)

4 months agoAdded `possibleInvertibleExpressionReferencedTransformedProperty` 80/4080/1
Tuukka Lehtonen [Mon, 30 Mar 2020 10:05:41 +0000 (13:05 +0300)]
Added `possibleInvertibleExpressionReferencedTransformedProperty`

This allows retrieval of the gain/bias applied to direct property
references in derived properties of user components.

Also switched DatasourceAdapter to use SLF4J logging instead of
java.util logging, which should not be used anywhere.

gitlab #505

Change-Id: I753b89fa1738e378e3e1ad5eac2a44e4dba9692f

4 months agoAdded Chart Preferences action to time series chart editor context menu 54/4054/2
Tuukka Lehtonen [Thu, 19 Mar 2020 23:46:45 +0000 (01:46 +0200)]
Added Chart Preferences action to time series chart editor context menu

gitlab #502

Change-Id: I901c2c4b92fb75b255aee3a123b0f5802f5c2fb3
(cherry picked from commit fa107b33201040a66ef237f3705395d74b22bb97)

4 months agoImproved Copy Visible Data usability in time series chart editor 53/4053/1
Tuukka Lehtonen [Thu, 19 Mar 2020 23:45:59 +0000 (01:45 +0200)]
Improved Copy Visible Data usability in time series chart editor

The action now first opens a preference dialog with only the CSV export
preferences shown which allows the user to know what settings are being
used to copy the data before actually copying, and also cancel the copy.

The preference page also shows which options are not used if resampling
is not enabled.

gitlab #501

Change-Id: If998d322f4286841c2c6bd3cbad479b8032b19ae
(cherry picked from commit 3af10e1cdc24856c072df9dc7cdc5c964756a533)

4 months agoSwitched to tycho 1.6.0 for minor build speedup
Tuukka Lehtonen [Thu, 19 Mar 2020 10:17:22 +0000 (12:17 +0200)]
Switched to tycho 1.6.0 for minor build speedup

Change-Id: I782e859805523e806f56b569e69f78950fc10a63

4 months agoDon't create degenerated transient RouteLines to RouteGraph 15/4015/1
Jussi Koskela [Wed, 11 Mar 2020 13:35:51 +0000 (15:35 +0200)]
Don't create degenerated transient RouteLines to RouteGraph

This change addresses the trivial cases. If multiple bends are required
we still get degenerated lines if the terminal is at the corner of the
bounds.

gitlab #495

Change-Id: Iac5d139ba805955c38d4b4e4906eda4795871a66
(cherry picked from commit 1aedad590d55facc132e458a578064300bac833c)

4 months agoAdded more literal type resolution logic to claimLiteral 99/3999/5
Tuukka Lehtonen [Tue, 17 Mar 2020 15:04:43 +0000 (17:04 +0200)]
Added more literal type resolution logic to claimLiteral

If the Class of the value doesn't tell which layer0-builtin type
resource to use, try to use the Datatype provided by the binding to
resolve the builtin type resource. If that fails also, resort to the the
old fallback behavior.

gitlab #496

Change-Id: Ie55984d2812bafa84c12f0a776b0d6de7e6a905d

4 months agoMerge "Fixed ProfileObserver.update race with multiple query threads"
Tuukka Lehtonen [Tue, 17 Mar 2020 10:54:14 +0000 (10:54 +0000)]
Merge "Fixed ProfileObserver.update race with multiple query threads"

4 months agoDirect and synchronization-free access to Layer0 resource class for DB 81/3981/4
Tuukka Lehtonen [Wed, 11 Mar 2020 07:55:08 +0000 (09:55 +0200)]
Direct and synchronization-free access to Layer0 resource class for DB

Also converts plenty of legacy Logger use to slf4j Logger.

gitlab #493

Change-Id: I0009ed3fd0c039312b1b9f74804cc2de2c39ec9a

4 months agoFixed ProfileObserver.update race with multiple query threads 97/3997/2
Tuukka Lehtonen [Mon, 16 Mar 2020 22:03:55 +0000 (00:03 +0200)]
Fixed ProfileObserver.update race with multiple query threads

gitlab #499

Change-Id: I79fcc0c67e6ac2850e8c6949e499219b5c43cfcf

4 months agoPrevent exceptions in procedural substructure requests 96/3996/1
Reino Ruusu [Mon, 16 Mar 2020 20:00:33 +0000 (22:00 +0200)]
Prevent exceptions in procedural substructure requests

gitlab #497

Change-Id: Iaec7ce4ac40fb07d7b91ab2d6d9f3609b10facaa

4 months agoFix handling of property variables with no predicate resource. 95/3995/1
Reino Ruusu [Mon, 16 Mar 2020 19:59:06 +0000 (21:59 +0200)]
Fix handling of property variables with no predicate resource.

gitlab #498

Change-Id: Iacbfdddca8d143b12950dd5166a835eefc44d270

4 months agoMerge "Fixed StyledtextContentAdapter to overwrite existing content properly"
Tuukka Lehtonen [Tue, 10 Mar 2020 16:12:33 +0000 (16:12 +0000)]
Merge "Fixed StyledtextContentAdapter to overwrite existing content properly"

4 months agoExpose diagramHints for customization 22/3922/1
Marko Luukkainen [Tue, 10 Mar 2020 11:21:21 +0000 (13:21 +0200)]
Expose diagramHints for customization

gitlab #494

Change-Id: I7545e9ff469cc819a07b48bbdfe3e781c8455b5d
(cherry picked from commit 59504249e01a0d803c5c4fdd4ba581d8272fee18)

4 months agoBumped master version to 1.44.0
Tuukka Lehtonen [Tue, 10 Mar 2020 08:53:18 +0000 (10:53 +0200)]
Bumped master version to 1.44.0

4 months agoExpose bounds based line routing case calculation. 21/3921/1
Marko Luukkainen [Mon, 9 Mar 2020 16:10:49 +0000 (18:10 +0200)]
Expose bounds based line routing case calculation.

Custom shaped terminals require bounds based case calculation, without
routeToBounds set to true (causes problems in web editor)

Change-Id: Icaadca88f37a574cf2de53f56a361684bfadba62
(cherry picked from commit 161fad9a336aa19d8dde691c213016907c412b83)

4 months agoFixed StyledtextContentAdapter to overwrite existing content properly 80/3980/1
Tuukka Lehtonen [Mon, 9 Mar 2020 16:11:02 +0000 (18:11 +0200)]
Fixed StyledtextContentAdapter to overwrite existing content properly

gitlab #492

Change-Id: I58e4feb40b13f8a9c6b0619776cf496d5f21a80b

5 months agoAsyncBarrier.dec runs into refcounting problem 75/3975/2
Antti Villberg [Sun, 8 Mar 2020 19:41:04 +0000 (21:41 +0200)]
AsyncBarrier.dec runs into refcounting problem

gitlab #490

Change-Id: I47b3e917a11038b444a326f03b46352d5671cbe0

5 months agoPrime SCL BindingRegistry to shave ~0.5s from startup 72/3972/2
jsimomaa [Fri, 6 Mar 2020 11:47:01 +0000 (13:47 +0200)]
Prime SCL BindingRegistry to shave ~0.5s from startup

gitlab #491

Change-Id: Ibbb04dce327697b81fdce894e10569af6b62c309

5 months agoMerge "Fixed platform ontology sync startup failure problems after installs"
Tuukka Lehtonen [Wed, 4 Mar 2020 21:54:06 +0000 (21:54 +0000)]
Merge "Fixed platform ontology sync startup failure problems after installs"

5 months agoFixed platform ontology sync startup failure problems after installs 63/3963/1
Tuukka Lehtonen [Wed, 4 Mar 2020 21:43:40 +0000 (23:43 +0200)]
Fixed platform ontology sync startup failure problems after installs

Installing a new plug-in that contains multiple ontologies that depend
transitively on each other caused startup failure due to database
requests not finding the newly installed ontology that the second
installed ontology depends on.

The solution is strategic query cache flushes before and after the
installation into immutable contexts.

Read more about it in the issue.

gitlab #464

Change-Id: I1ad28585a85ad3a31cac8e058d0c6872e894be92

5 months agoSupport fox six component Json array 16/3916/1
Marko Luukkainen [Mon, 2 Mar 2020 14:02:36 +0000 (16:02 +0200)]
Support fox six component Json array

gitlab #489

Change-Id: I01617086a1abab7a8400fe2b14456bce2647d22e
(cherry picked from commit 3bfc832da98007484d90add605f5fc0fb056f676)

5 months agoNew version of hdf.hdf5 feature required due to upgraded slf4j dep 46/3946/2
Tuukka Lehtonen [Sat, 29 Feb 2020 07:53:06 +0000 (09:53 +0200)]
New version of hdf.hdf5 feature required due to upgraded slf4j dep

Maven has cached hdf.hdf5 feature build in many places with version
1.10.2 which has a strict dependency on org.slf4j.api 1.7.25. SLF4j was
just upgraded to 1.7.30 meaning this feature no longer resolves properly
because Maven will use the old cached artifact. We need to bump the
feature version with a qualifier suffix `.b0001` to get maven to get the
fetch the new version.

gitlab #486

Change-Id: I17411c99e474dff6d121862e99ccc8f814507af4

5 months agoAdded simple instructions on IDE installation
Tuukka Lehtonen [Fri, 28 Feb 2020 23:29:02 +0000 (01:29 +0200)]
Added simple instructions on IDE installation

gitlab #486

5 months agoMirrored CBI TPD tool and eclipse collections to simantics.org 45/3945/1
Tuukka Lehtonen [Fri, 28 Feb 2020 22:53:16 +0000 (00:53 +0200)]
Mirrored CBI TPD tool and eclipse collections to simantics.org

Also added a maven pom for running the tpd to target converter from
command line at releng/org.simantics.sdk.build.targetdefinition/build.

gitlab #486

Change-Id: Ic30c685556797249c28f50936727dccb58484bd9

5 months agoRegenerate simantics.target after eclipse collections changes 44/3944/1
Tuukka Lehtonen [Fri, 28 Feb 2020 13:06:48 +0000 (15:06 +0200)]
Regenerate simantics.target after eclipse collections changes

gitlab #486

Change-Id: Ice9dc7307c1f616bb2d5bffba057d48227e76340

5 months agoFetch eclipse-collections from p2 repo to get OSGI version automatically 43/3943/5
jsimomaa [Fri, 28 Feb 2020 11:53:16 +0000 (13:53 +0200)]
Fetch eclipse-collections from p2 repo to get OSGI version automatically

gitlab #486

Change-Id: Ifc15996271c165300212368bb90b09427d24a850

5 months agoUpdate simantics.target with new external component versions 42/3942/1
jsimomaa [Fri, 28 Feb 2020 08:20:01 +0000 (10:20 +0200)]
Update simantics.target with new external component versions

gitlab #485
gitlab #486

Change-Id: I85f3deab323b09ed6b4811306df692d0fb9ab934

5 months agoMerge "Tons of dependency fixes and updates"
Jani Simomaa [Fri, 28 Feb 2020 08:02:37 +0000 (08:02 +0000)]
Merge "Tons of dependency fixes and updates"

5 months agoTons of dependency fixes and updates 37/3937/20
Tuukka Lehtonen [Thu, 27 Feb 2020 11:59:15 +0000 (13:59 +0200)]
Tons of dependency fixes and updates

* Removed unused JARs from org.simantics.scenegraph and re-exported
  org.apache.batik from there instead of including three old batik JARs
  internally to export the batik parser.
* Replaced all dependencies on org.apache.commons.collections with
  org.apache.commons.collections4
* Removed version specifiers from all org.slf4j.api and
  org.eclipse.collections.eclipse-collections* dependencies
  to avoid the need to modify them down the road with new major releases
* Explicitly specified all Jetty dependencies to be on version 9.4.24
  in an attempt to avoid OSGi (Felix) bundle wiring performance problems
  experienced by Marko in recent developments.

gitlab #485
gitlab #486

Change-Id: Id5a3d62a007fad4a45f601b4d471f061395e556b

5 months agoExport jersey internal packages for jersey-media-multipart 40/3940/1
jsimomaa [Fri, 28 Feb 2020 07:23:40 +0000 (09:23 +0200)]
Export jersey internal packages for jersey-media-multipart

gitlab #486

Change-Id: I4fb177fa365babfab7950a920784328f2976569d

5 months agoUpdate rest of external components & explicitly export javax.ws.rs* 39/3939/1
jsimomaa [Fri, 28 Feb 2020 07:00:45 +0000 (09:00 +0200)]
Update rest of external components & explicitly export javax.ws.rs*

gitlab #486

Change-Id: I858750bb69a0ebade617c72f29ee76330394954e

5 months agoUpdate rest of external components 38/3938/1
jsimomaa [Fri, 28 Feb 2020 06:19:56 +0000 (08:19 +0200)]
Update rest of external components

gitlab #486

Change-Id: I7f3bed6a5d6271fa94f1f1e7e6f3619fa7c85d02

5 months agoUpdating external component versions & add influxdb-client 36/3936/3
jsimomaa [Thu, 27 Feb 2020 11:41:56 +0000 (13:41 +0200)]
Updating external component versions & add influxdb-client

gitlab #486

Change-Id: I4348db51b082aedaf26bd8c9458f1b81cef0f512

5 months agoThread safety changes in objmap2 33/3933/1
Reino Ruusu [Mon, 24 Feb 2020 11:56:41 +0000 (13:56 +0200)]
Thread safety changes in objmap2

gitlab #483

Change-Id: I3a831732961ff7fc3ac6db3a2fdb94c2e9361d7a

5 months agoEliminate unnecessary storage of graph objects in map objects. 12/3912/1
Reino Ruusu [Tue, 25 Feb 2020 16:32:21 +0000 (18:32 +0200)]
Eliminate unnecessary storage of graph objects in map objects.

gitlab #482

Change-Id: Id600bda6892857a376cd169219636dc0300763d4

5 months agoFlush listener registrations before garbage collecting queries/listeners 11/3911/1
Tuukka Lehtonen [Tue, 25 Feb 2020 22:24:19 +0000 (00:24 +0200)]
Flush listener registrations before garbage collecting queries/listeners

gitlab #481

Change-Id: I5aa5c3ef420faebba4a2c347cd999035bada675f

5 months agoFinish exception handling in AdapterRegistry2 15/3915/1
jsimomaa [Tue, 25 Feb 2020 13:26:33 +0000 (15:26 +0200)]
Finish exception handling in AdapterRegistry2

gitlab #480

Change-Id: I339986806570a4373456e4fb92a7b7712f531f7b
(cherry picked from commit 8eea274269dd791b7ef95ca03bf891654e0c4ffc)

5 months agoSeparate TextNode handling for SCLSceneGraph 14/3914/1
Marko Luukkainen [Mon, 24 Feb 2020 17:49:46 +0000 (19:49 +0200)]
Separate TextNode handling for SCLSceneGraph

gitlab #476

Change-Id: Ib50bf50f7b6b39573fceae8ff1cc87f7ef203885
(cherry picked from commit fc7afa94bb7704fedf0dd2f3da7923d6aa732ea3)

5 months agoMerge "Add line bounds to highlight bounds to get actual bounds."
Marko Luukkainen [Tue, 25 Feb 2020 08:59:35 +0000 (08:59 +0000)]
Merge "Add line bounds to highlight bounds to get actual bounds."

5 months agoMerge "Temporarily added debug logging to MipMapBufferedImage for debugging"
Tuukka Lehtonen [Mon, 24 Feb 2020 23:05:02 +0000 (23:05 +0000)]
Merge "Temporarily added debug logging to MipMapBufferedImage for debugging"

5 months agoTemporarily added debug logging to MipMapBufferedImage for debugging 05/3905/1
Tuukka Lehtonen [Mon, 24 Feb 2020 23:02:32 +0000 (01:02 +0200)]
Temporarily added debug logging to MipMapBufferedImage for debugging

gitlab #477

Change-Id: I553d4f7ed99c0b48cf1fe386669ae46d6ca68de2

5 months agoAdd line bounds to highlight bounds to get actual bounds. 13/3913/1
Marko Luukkainen [Mon, 24 Feb 2020 12:58:14 +0000 (14:58 +0200)]
Add line bounds to highlight bounds to get actual bounds.

This fixes text clipping with italic font

gitlab #475

Change-Id: I7223d6b7e960f28c61644ba7bc608b46530a58a1
(cherry picked from commit 5d435de8ba4147560a795f8873d234a0489050b2)

5 months agoRemove single quotes from font-family value 52/3852/1
Marko Luukkainen [Mon, 24 Feb 2020 08:43:36 +0000 (10:43 +0200)]
Remove single quotes from font-family value

gitlab #474

Change-Id: Ic63ff4a33739835f809e9a87dc8f31a3d375346d
(cherry picked from commit 738c0625bf766316b39aa7c9884a47d3711d548c)

5 months agoStop using pack200 because it has been deprecated and removed
Tuukka Lehtonen [Sun, 23 Feb 2020 01:04:56 +0000 (03:04 +0200)]
Stop using pack200 because it has been deprecated and removed

Deprecated in Java 11 https://openjdk.java.net/jeps/336 and removed
in Java 14 https://openjdk.java.net/jeps/367.

The main problem for us now is that the packed JARs don't get
signed when using maven-jarsigner-plugin, while the unpacked
ones do. Simplest solution is to let go of pack200 already.

gitlab #468

Change-Id: I2f6769802cfa51f9d2fd410a125831849f7d484f