]> gerrit.simantics Code Review - simantics/platform.git/log
simantics/platform.git
7 years ago(refs #7250) CHR rules modularization (first working version) 85/585/5
Hannu Niemistö [Thu, 1 Jun 2017 10:04:26 +0000 (13:04 +0300)]
(refs #7250) CHR rules modularization (first working version)

This change adds a complete implementation of CHR modularization. New
top level declaration ruleset allows to define rulesets that can be
included into other rulesets (see CHR{5,6}.scl).

Change-Id: I3a188d788602fa27f863e16969f956d79c9684a9

7 years ago(refs #7250) Added new grammar rules for modular CHR rules 84/584/1
Hannu Niemistö [Wed, 31 May 2017 07:33:42 +0000 (10:33 +0300)]
(refs #7250) Added new grammar rules for modular CHR rules

Change-Id: I55851a496fda5b1bc135a17d37f28770b36f5007

7 years ago(refs #7250) Refactoring CHR implementation 79/579/2
Hannu Niemistö [Tue, 30 May 2017 07:49:26 +0000 (10:49 +0300)]
(refs #7250) Refactoring CHR implementation

This change is preparation for the modularization of the CHR rule
systems. The main change is moving the major rule execution code from
fact classes to priority level classes.

Change-Id: Idd63339d8c2cf81e2af07660f0f81cae273c1d62

7 years agoDiagram to SVG enhancements 70/570/5
Antti Villberg [Mon, 29 May 2017 12:06:26 +0000 (15:06 +0300)]
Diagram to SVG enhancements

refs #7253

Change-Id: I155f57928428f8ec4c39ffad90558396547dc10f

7 years agoMerge "Fixes to variable implementations"
Tuukka Lehtonen [Tue, 30 May 2017 05:36:33 +0000 (08:36 +0300)]
Merge "Fixes to variable implementations"

7 years agoFixes to variable implementations 68/568/2
Antti Villberg [Mon, 29 May 2017 12:04:37 +0000 (15:04 +0300)]
Fixes to variable implementations

refs #7251

Change-Id: Ideebcc4caca35339544554c287cccb2107caced3

7 years agoMerge "(refs #7250) Cleaning up CHR code generation"
Hannu Niemistö [Mon, 29 May 2017 13:36:07 +0000 (16:36 +0300)]
Merge "(refs #7250) Cleaning up CHR code generation"

7 years agoOpenDefaultEditor should not cache adapters that cannot be opened 69/569/2
Antti Villberg [Mon, 29 May 2017 12:05:28 +0000 (15:05 +0300)]
OpenDefaultEditor should not cache adapters that cannot be opened

#7252

Change-Id: Idf1a4e15fd808c540934dbfc6bc75d5b72016a1b

7 years ago(refs #7250) Cleaning up CHR code generation 67/567/1
Hannu Niemistö [Mon, 29 May 2017 11:53:57 +0000 (14:53 +0300)]
(refs #7250) Cleaning up CHR code generation

Change-Id: Iad454f1f7cdc0f27e21a2db03680312f49ab1059

7 years agoMerge "(refs #7245) The first version of decompiler for SCL compilations"
Hannu Niemistö [Mon, 29 May 2017 11:44:07 +0000 (14:44 +0300)]
Merge "(refs #7245) The first version of decompiler for SCL compilations"

7 years agoMerge "Added Simantics/Diagram function positionToVector."
Tuukka Lehtonen [Mon, 29 May 2017 11:38:41 +0000 (14:38 +0300)]
Merge "Added Simantics/Diagram function positionToVector."

7 years agoAdded Simantics/Diagram function positionToVector. 66/566/1
Tuukka Lehtonen [Mon, 29 May 2017 09:58:32 +0000 (12:58 +0300)]
Added Simantics/Diagram function positionToVector.

This function complements the existing positionToDoubleArray and is
required to support for instance diagram template scenegraph node
transform property definition with SCL formulas.

Also fixes:
* Potential NPE in ExperimentUtil.scheduleShutdownActiveExperiment
* MANIFEST.MF warnings from org.simantics.document.server

refs #7246

Change-Id: Icfe41a33824c91e5be76940bbf4d46d34c8d0334

7 years agoSupport for dynamic transforms for both elements and terminals 61/561/5
Antti Villberg [Sat, 27 May 2017 06:29:23 +0000 (09:29 +0300)]
Support for dynamic transforms for both elements and terminals

Includes also minor code warning/logging cleanup.

refs #7119

Change-Id: I2df8f0f0707e8adf1569679ab41a74f605ae1268

7 years ago(refs #7245) The first version of decompiler for SCL compilations 64/564/2
Hannu Niemistö [Mon, 29 May 2017 09:23:24 +0000 (12:23 +0300)]
(refs #7245) The first version of decompiler for SCL compilations

It is intentional that the new fragment
org.simantics.scl.compiler.decompiler is not added to the module
listings in bundles/pom.xml, because currently this feature is intended
only for development purposes.

Change-Id: Iff184f783c1a924ff00823486b4c13aa957ca184

7 years ago(refs #7242) Fixed NPE in SCLModuleTree 63/563/1
Hannu Niemistö [Mon, 29 May 2017 09:15:18 +0000 (12:15 +0300)]
(refs #7242) Fixed NPE in SCLModuleTree

A null input must be handled when the component is disposed.

Change-Id: I915c68aa3d15b4d5a3cbd89220bd3701f262fee1

7 years agoAdded procyon decompiler to target platform 62/562/1
Hannu Niemistö [Sun, 28 May 2017 16:44:57 +0000 (19:44 +0300)]
Added procyon decompiler to target platform

Change-Id: I0bfad66709f89c3c27f16311d3adde69b80afda2

7 years ago(refs #6923) Explicit export annotation for SCL modules 60/560/1
Hannu Niemistö [Fri, 26 May 2017 07:53:51 +0000 (10:53 +0300)]
(refs #6923) Explicit export annotation for SCL modules

Added module export list to module header. It looks like this:

module {
    export = [foo, bar]
}

When using export list, @private annotation is not supported anymore.
All symbols not exported are effectively private.

Change-Id: I7827f6cf6062388ddd06be0ab401409bd08464fe

7 years agoJersey HTTP Client - increase .target's sequenceNumber just in case 59/559/2
jsimomaa [Thu, 25 May 2017 04:07:50 +0000 (07:07 +0300)]
Jersey HTTP Client - increase .target's sequenceNumber just in case

#7243

Change-Id: I455326fbad7adfff04fa0a23a50ab689d3091e7b

7 years agoMerge "Add missing jersey-server for Jersey HTTP Client.. does not make sense.."
Jani Simomaa [Thu, 25 May 2017 04:02:00 +0000 (07:02 +0300)]
Merge "Add missing jersey-server for Jersey HTTP Client.. does not make sense.."

7 years agoAdd missing jersey-server for Jersey HTTP Client.. does not make sense.. 58/558/1
jsimomaa [Thu, 25 May 2017 04:01:28 +0000 (07:01 +0300)]
Add missing jersey-server for Jersey HTTP Client.. does not make sense..

#7243

Change-Id: I378c43b1d9f72dc98b9f23d790c544238fe177f3

7 years agoMerge "(refs #7242) Refresh button to SCL Module browser"
Hannu Niemistö [Wed, 24 May 2017 20:43:32 +0000 (23:43 +0300)]
Merge "(refs #7242) Refresh button to SCL Module browser"

7 years agoMerge "Jersey HTTP Client - Remove (hopefully) unnecessary dependencies.."
Jani Simomaa [Wed, 24 May 2017 19:31:35 +0000 (22:31 +0300)]
Merge "Jersey HTTP Client - Remove (hopefully) unnecessary dependencies.."

7 years agoJersey HTTP Client - Remove (hopefully) unnecessary dependencies.. 57/557/1
jsimomaa [Wed, 24 May 2017 19:28:55 +0000 (22:28 +0300)]
Jersey HTTP Client - Remove (hopefully) unnecessary dependencies..

Change-Id: I7e532295639158da7f0971cd75252a0068406b3e

7 years agoMerge "Jersey HTTP Client - Why "-" is not good enough for versioning?"
Jani Simomaa [Wed, 24 May 2017 19:12:02 +0000 (22:12 +0300)]
Merge "Jersey HTTP Client - Why "-" is not good enough for versioning?"

7 years agoJersey HTTP Client - Why "-" is not good enough for versioning? 56/556/1
jsimomaa [Wed, 24 May 2017 19:11:50 +0000 (22:11 +0300)]
Jersey HTTP Client - Why "-" is not good enough for versioning?

#7243

Change-Id: I98952ab61b6e4ef1a37795bab2a530772a2761ae

7 years agoJersey HTTP Client - Oh my ruis, yet another version mismatch 55/555/1
jsimomaa [Wed, 24 May 2017 19:06:00 +0000 (22:06 +0300)]
Jersey HTTP Client - Oh my ruis, yet another version mismatch

#7243

Change-Id: I0be124f994a3ed777c48792a68de59e489a3c3c8

7 years agoJersey HTTP Client - Ok now I get how this works 54/554/1
jsimomaa [Wed, 24 May 2017 18:58:24 +0000 (21:58 +0300)]
Jersey HTTP Client - Ok now I get how this works

#7243

Change-Id: I69fa5d738663f0dee462a41841097bc70f9f7e6e

7 years agoJersey HTTP Client - Still going strong 53/553/1
jsimomaa [Wed, 24 May 2017 18:48:28 +0000 (21:48 +0300)]
Jersey HTTP Client - Still going strong

#7243

Change-Id: Ied41cc202f0efb01aefacd737b673e47eb209960

7 years agoJersey HTTP Client - almost finished :) 52/552/1
jsimomaa [Wed, 24 May 2017 18:45:45 +0000 (21:45 +0300)]
Jersey HTTP Client - almost finished :)

#7243

Change-Id: Ie7f79a9980ddb2e8c9d60dfb76f670a30267f400

7 years agoJersey HTTP Client - Wrong version numbers.. 51/551/1
jsimomaa [Wed, 24 May 2017 18:40:37 +0000 (21:40 +0300)]
Jersey HTTP Client - Wrong version numbers..

#7243

Change-Id: Id0af2b5d4caae2dfc12d87b2b2d5d94b5cc4df5c

7 years agoForgot to update logback and slf4j version in target files 50/550/1
jsimomaa [Wed, 24 May 2017 18:32:38 +0000 (21:32 +0300)]
Forgot to update logback and slf4j version in target files

#7243

Change-Id: I24e9e8ef33f856c4eb826c58bfee7dec5acc86ed

7 years agoAdding Jersey HTTP Client to target platform 49/549/1
jsimomaa [Wed, 24 May 2017 18:24:56 +0000 (21:24 +0300)]
Adding Jersey HTTP Client to target platform

#7243

Change-Id: I004c550f611b2dec92c9a680e62d023ea1095ea3

7 years ago(refs #7242) Refresh button to SCL Module browser 48/548/1
Hannu Niemistö [Wed, 24 May 2017 17:28:07 +0000 (20:28 +0300)]
(refs #7242) Refresh button to SCL Module browser

Change-Id: I51a7441fc6fe702b6f7fc4410b67e24e6d788ae4

7 years agoAdded null check to StreamingTransferableGraphImportProcess 46/546/1
Hannu Niemistö [Wed, 24 May 2017 12:20:58 +0000 (15:20 +0300)]
Added null check to StreamingTransferableGraphImportProcess

refs #7240
Change-Id: I5724ddfff4eae6c17dcd92eff71e25fb80bc8cf6

7 years agoMerge "StreamingTransferableGraphImportProcess assumes index root cluster set"
Tuukka Lehtonen [Wed, 24 May 2017 10:40:28 +0000 (13:40 +0300)]
Merge "StreamingTransferableGraphImportProcess assumes index root cluster set"

7 years ago(refs #7242) First version of SCL Development perspective 44/544/2
Hannu Niemistö [Wed, 24 May 2017 08:50:15 +0000 (11:50 +0300)]
(refs #7242) First version of SCL Development perspective

Change-Id: Ica1a3d93c05e11ccee2cab3c0cf517cbe332106a

7 years agoStreamingTransferableGraphImportProcess assumes index root cluster set 45/545/1
Antti Villberg [Tue, 23 May 2017 11:00:44 +0000 (14:00 +0300)]
StreamingTransferableGraphImportProcess assumes index root cluster set

refs #7240

Change-Id: I32ef3d78a8c278849fa6a44052a85e61510a72f5
(cherry picked from commit b8403a3565fc946a389ea509ef8fd4067610fa00)

7 years agoLayerCleanupMigrationStep is too eager 43/543/1
Antti Villberg [Tue, 23 May 2017 11:02:22 +0000 (14:02 +0300)]
LayerCleanupMigrationStep is too eager

refs #7241

Change-Id: Ia389c085b09270a9bea5479ffaefbb2eb08a1ef7

7 years agoBetter and prettier printing 40/540/1
jsimomaa [Mon, 22 May 2017 09:05:09 +0000 (12:05 +0300)]
Better and prettier printing

refs 7224

Change-Id: I6afdcfe04f4cef811c514b1c2f42478ebee30646

7 years agoMerge "Support DB images in url requests"
Jani Simomaa [Mon, 22 May 2017 08:09:13 +0000 (11:09 +0300)]
Merge "Support DB images in url requests"

7 years agoMerge "Console printing also for content prints"
Jani Simomaa [Mon, 22 May 2017 08:08:58 +0000 (11:08 +0300)]
Merge "Console printing also for content prints"

7 years agoConsole printing also for content prints 39/539/2
Antti Villberg [Fri, 19 May 2017 11:29:13 +0000 (14:29 +0300)]
Console printing also for content prints

refs #7226

Change-Id: Ia95b0d5e2432d8a9a2697a9184dd268a6c1fb8ab

7 years agoSupport DB images in url requests 38/538/2
Antti Villberg [Fri, 19 May 2017 11:28:19 +0000 (14:28 +0300)]
Support DB images in url requests

refs #7237

Change-Id: If642626d1ee420af0c694f48a3304cd51455465c

7 years agoMore console printing 36/536/2
Antti Villberg [Fri, 19 May 2017 11:25:45 +0000 (14:25 +0300)]
More console printing

refs #7226

Change-Id: I255d30cc7188e6aff2111952b1a37ee4c755be68

7 years agoCheck head.state file existence before validating its integrity 33/533/1
Tuukka Lehtonen [Wed, 17 May 2017 13:26:41 +0000 (16:26 +0300)]
Check head.state file existence before validating its integrity

This prevents unnecessary NoSuchFileExceptions from being logged at
startup.

refs #7124

Change-Id: I500c937ec8894f6c97dcfe73b01efc4adc9b59a6
(cherry picked from commit b4e846e4206e688050b659f2d66581d26e3dc1ce)

7 years agoMerge "(refs #6878) Don't validate SCL expressions in console input area"
Hannu Niemistö [Wed, 17 May 2017 10:53:26 +0000 (13:53 +0300)]
Merge "(refs #6878) Don't validate SCL expressions in console input area"

7 years ago(refs #6878) Don't validate SCL expressions in console input area 31/531/1
Hannu Niemistö [Wed, 17 May 2017 10:07:41 +0000 (13:07 +0300)]
(refs #6878) Don't validate SCL expressions in console input area

Change-Id: I49ab2879aaf55bddf1e47c980bd944fbe32e2f5a

7 years agoCalculating bounding box for dynamic symbol fails for empty TSpan 29/529/1
Jussi Koskela [Tue, 16 May 2017 05:23:41 +0000 (08:23 +0300)]
Calculating bounding box for dynamic symbol fails for empty TSpan

Replace empty content with dash as a workaround.

refs #7231

Change-Id: Iac8257d12d4a6201f766a7458c6315ab5e84f113

7 years ago(refs #6178) Added missing dependencies of kryo to target files 28/528/1
Hannu Niemistö [Mon, 15 May 2017 19:12:24 +0000 (22:12 +0300)]
(refs #6178) Added missing dependencies of kryo to target files

Change-Id: I26acf11b3218ec6a6ac0716abcff23dbdf326743

7 years agoMerge "(refs #6178) Added Kryo serialization library to target platform"
Tuukka Lehtonen [Mon, 15 May 2017 14:35:11 +0000 (17:35 +0300)]
Merge "(refs #6178) Added Kryo serialization library to target platform"

7 years ago(refs #6178) Added Kryo serialization library to target platform 27/527/2
Hannu Niemistö [Mon, 15 May 2017 14:14:01 +0000 (17:14 +0300)]
(refs #6178) Added Kryo serialization library to target platform

Change-Id: I419b756f648a40a4f3809bb5eb8e1d6b8c399d1b

7 years agoCompilePGraphs takes previous bundled version of ontology 25/525/2
Antti Villberg [Mon, 15 May 2017 07:53:28 +0000 (10:53 +0300)]
CompilePGraphs takes previous bundled version of ontology

#7229

Change-Id: I71520cf139aa4131031a59bd377ca82410d36044

7 years agoMake NodeContext builtin keys available through Simantics/All 24/524/2
Antti Villberg [Sat, 13 May 2017 18:37:09 +0000 (21:37 +0300)]
Make NodeContext builtin keys available through Simantics/All

refs #7227

Change-Id: I8890d36f31feac77fcda9f9684b7cab86c7d8f91

7 years agoConsole printing enhancements for documents (Simupedia) 23/523/2
Antti Villberg [Sat, 13 May 2017 18:36:10 +0000 (21:36 +0300)]
Console printing enhancements for documents (Simupedia)

#7226

Change-Id: Ib6f67ee6461dd3cec7d22b60c784631b065a4caa

7 years agoAn action to show a pgraph for resources in ontologies 22/522/2
Antti Villberg [Sat, 13 May 2017 18:33:37 +0000 (21:33 +0300)]
An action to show a pgraph for resources in ontologies

#7225

Change-Id: I358fc705d5a7afcb20edb6520019a3689a978cd7

7 years agoPrettyPrintTG enhancements 21/521/2
Antti Villberg [Sat, 13 May 2017 18:16:12 +0000 (21:16 +0300)]
PrettyPrintTG enhancements

refs #7224

Change-Id: Ieff6b12540bc1c1e076ddda376d59e0b3529a791

7 years agoEnsure ExperimentUtil.scheduleShutdownActiveExperiment invokes callback 20/520/1
Tuukka Lehtonen [Sat, 13 May 2017 10:18:29 +0000 (13:18 +0300)]
Ensure ExperimentUtil.scheduleShutdownActiveExperiment invokes callback

This needs to be done because calling parties may rely on getting the
callback.

refs #7220

Change-Id: Ie81c20da8da9d734afe7f98cf1117176b2f2dc9d
(cherry picked from commit 51239a7b24d812eec59b7f635ed0cfd9d116a268)

7 years ago(refs #7219) Remove deprecated code (scl.compiler.dummy and editor) 18/518/2
Hannu Niemistö [Fri, 12 May 2017 21:12:51 +0000 (00:12 +0300)]
(refs #7219) Remove deprecated code (scl.compiler.dummy and editor)

Change-Id: Ibd2bc7b4ca78637460701351b7511dc77ba6ef2f

7 years agoMerge "Workaround fix for acorn mutex printing for now"
Hannu Niemistö [Fri, 12 May 2017 19:50:06 +0000 (22:50 +0300)]
Merge "Workaround fix for acorn mutex printing for now"

7 years agoWorkaround fix for acorn mutex printing for now 17/517/1
jsimomaa [Fri, 12 May 2017 18:49:34 +0000 (21:49 +0300)]
Workaround fix for acorn mutex printing for now

This needs to be fixed somehow else but just a workaround for now to
prevent flooding of prints

refs #7175

Change-Id: Ia218bbfc8bd82679fb7f365c706b74c1753a1795

7 years agoMerge "(refs #6878) validateOnly flag to ExpressionEvaluator and CommandSession"
Hannu Niemistö [Fri, 12 May 2017 18:47:45 +0000 (21:47 +0300)]
Merge "(refs #6878) validateOnly flag to ExpressionEvaluator and CommandSession"

7 years agoMerge "(refs #7214) Treat $ exactly like function application"
Hannu Niemistö [Fri, 12 May 2017 18:47:27 +0000 (21:47 +0300)]
Merge "(refs #7214) Treat $ exactly like function application"

7 years ago(refs #6878) validateOnly flag to ExpressionEvaluator and CommandSession 15/515/4
Hannu Niemistö [Fri, 12 May 2017 10:58:22 +0000 (13:58 +0300)]
(refs #6878) validateOnly flag to ExpressionEvaluator and CommandSession

Added a new flag validateOnly to ExpressionEvaluator and CommandSession.
This prevents the execution of the expression. In command session,
variable types are however updated, so it is possible to run longer
command sequences and check their types. To use the flag, run the script
in CommandSession with static method validate.

Change-Id: I3fbb5501c8a902f2f3ea547d5c5bc7d693df3a77

7 years agoMerge changes Ib64cf026,I238948da
Tuukka Lehtonen [Fri, 12 May 2017 12:22:15 +0000 (15:22 +0300)]
Merge changes Ib64cf026,I238948da

* changes:
  Enhancements to modelled STS-tests
  Minor SCL enhancements and fixes for logging and test executing

7 years agoMerge "(refs #7216) Removed OldTransferableGraph1 and all referring code"
Marko Luukkainen [Fri, 12 May 2017 12:12:41 +0000 (15:12 +0300)]
Merge "(refs #7216) Removed OldTransferableGraph1 and all referring code"

7 years agoMerge "(refs #7218) Sort labels by integer values when generating switch"
Tuukka Lehtonen [Fri, 12 May 2017 11:56:07 +0000 (14:56 +0300)]
Merge "(refs #7218) Sort labels by integer values when generating switch"

7 years agoEnhancements to modelled STS-tests 13/513/3
jsimomaa [Fri, 12 May 2017 07:25:50 +0000 (10:25 +0300)]
Enhancements to modelled STS-tests

Some refactoring and streamlining for the modelled STS-tests:

* Possibility to ignore certain tests
* Streamlined JUnit execution of modelled tests
* Removed duplicate code related to modelled STS test searching
* Introduced Junit/Assert SCL-module for assertions in SCL tests
* Changed STSTestEditor to extend SCLModuleEditor2

Change-Id: Ib64cf026f69e7490a6eb831afd88d909b80ed8b7

7 years agoMinor SCL enhancements and fixes for logging and test executing 12/512/2
jsimomaa [Fri, 12 May 2017 07:22:52 +0000 (10:22 +0300)]
Minor SCL enhancements and fixes for logging and test executing

Also fixing Simantics/Misc getSystemProperty to return Maybe String

refs #7217

Change-Id: I238948da90f95b1b7e16d35112acb41eecb75d61

7 years agoMerge "(refs #7215) Preserve identity types in NamespaceMigrationStep"
Hannu Niemistö [Fri, 12 May 2017 10:24:49 +0000 (13:24 +0300)]
Merge "(refs #7215) Preserve identity types in NamespaceMigrationStep"

7 years ago(refs #7218) Sort labels by integer values when generating switch 14/514/1
Hannu Niemistö [Fri, 12 May 2017 10:22:50 +0000 (13:22 +0300)]
(refs #7218) Sort labels by integer values when generating switch

Change-Id: Ic6acb6241151f3d178e4c5bdf9c4fac5424b6100

7 years ago(refs #7216) Removed OldTransferableGraph1 and all referring code 11/511/1
Hannu Niemistö [Fri, 12 May 2017 07:20:15 +0000 (10:20 +0300)]
(refs #7216) Removed OldTransferableGraph1 and all referring code

Change-Id: Idde9dde36c06b5270730036ab7e435f38f59a5fd

7 years ago(refs #7215) Preserve identity types in NamespaceMigrationStep 10/510/1
Hannu Niemistö [Fri, 12 May 2017 07:12:59 +0000 (10:12 +0300)]
(refs #7215) Preserve identity types in NamespaceMigrationStep

Change-Id: Ida23a57053d0bca00523b4a87e6c896810373602

7 years ago(refs #7214) Treat $ exactly like function application 09/509/2
Hannu Niemistö [Thu, 11 May 2017 19:54:24 +0000 (22:54 +0300)]
(refs #7214) Treat $ exactly like function application

Converts (f $ p) before type checking to (f p). This slightly changes
the semantics of the language for it is now possible to use $ with
functions like runProc, syncRead etc.

Change-Id: Ida816667a5c9d7623d59ca998a34fe98df5b4732

7 years agoAdded mechanism to diagram IFlagType to prevent graph modifications 07/507/1
Tuukka Lehtonen [Thu, 11 May 2017 11:19:32 +0000 (14:19 +0300)]
Added mechanism to diagram IFlagType to prevent graph modifications

When diagram flags are loaded, some implementations trigger graph
modifications because the flag type may know the flag to have wrong
direction information based on analysis of the model. Printing diagrams
to PDF or SVG should not modify the database in any way, just trust what
is in there.

refs #7208

Change-Id: Id2d438c0523ed708a0d11219a8efd6954ac5000e
(cherry picked from commit c92959f34dd3cf5f365d8798839a919840b5487a)

7 years agoMerge "Performance enhancements for DiagramToSVG"
Tuukka Lehtonen [Thu, 11 May 2017 11:44:58 +0000 (14:44 +0300)]
Merge "Performance enhancements for DiagramToSVG"

7 years agoPerformance enhancements for DiagramToSVG 05/505/1
Antti Villberg [Thu, 11 May 2017 09:26:02 +0000 (12:26 +0300)]
Performance enhancements for DiagramToSVG

refs #7208

Change-Id: Ieb507e6c9abc287192fff127385cc51f17ebee86
(cherry picked from commit 5655da36b1f5b605b2407b34f1226a9ad60f8ce6)

7 years agoStyleBase runs cleanup in wrong thread 04/504/1
Antti Villberg [Thu, 11 May 2017 09:24:22 +0000 (12:24 +0300)]
StyleBase runs cleanup in wrong thread

refs #7206

Change-Id: I607539b6e5aabc947976308b972976ee97b9c4ea
(cherry picked from commit d156f756b493ce0f853fcb5619809812ea764167)

7 years agoMerge "Fix RouteGraphNode styling"
Tuukka Lehtonen [Thu, 11 May 2017 10:55:39 +0000 (13:55 +0300)]
Merge "Fix RouteGraphNode styling"

7 years agoMerge "Paster.getGraph() method for overriding classes."
Marko Luukkainen [Thu, 11 May 2017 09:49:56 +0000 (12:49 +0300)]
Merge "Paster.getGraph() method for overriding classes."

7 years agoFix RouteGraphNode styling 03/503/1
Marko Luukkainen [Thu, 11 May 2017 09:27:35 +0000 (12:27 +0300)]
Fix RouteGraphNode styling

fixes #7209

Change-Id: I05ea45c1dd01cf9502970e9e99c1a278b2cd73a2

7 years agoPaster.getGraph() method for overriding classes. 00/500/1
Marko Luukkainen [Thu, 11 May 2017 09:23:34 +0000 (12:23 +0300)]
Paster.getGraph() method for overriding classes.

refs #7205

Change-Id: Ie488312ad9b995351a55f557e3686d8e4408ceac

7 years agoAdd org.simantics.db.testing to org.simantics.sdk feature 99/499/1
Tuukka Lehtonen [Wed, 10 May 2017 06:55:04 +0000 (09:55 +0300)]
Add org.simantics.db.testing to org.simantics.sdk feature

This adds the plug-in to the build results.

refs #7204

Change-Id: I083ba9da5b8dc60fe8eab167b786663034f6e343

7 years agoAdd org.simantics.db.testing plugin to SDK build 98/498/1
jsimomaa [Wed, 10 May 2017 06:01:27 +0000 (09:01 +0300)]
Add org.simantics.db.testing plugin to SDK build

refs #7204

Change-Id: Ifac7487f2a8d232372421e75550dc2e63cd7df5c

7 years agoImproved logic in new head state creation. 97/497/2
Jussi Koskela [Tue, 9 May 2017 13:12:17 +0000 (16:12 +0300)]
Improved logic in new head state creation.

Earlier any IOException during the reading of head state was interpreted
as empty DB. This might cause unwanted DB reset. It's better to identify
need for empty head state based on main state head directory.

Switched AcornDatabase.start logic back to using RandomAccessFile for
touching the db/lock file. Using RandomAccessFile instead of
FileSystemProvider.newFileChannel in Windows better prevents any other
process from removing the lock file. The newFileChannel version did not
prevent the user from initially running 'del lock' to remove the file -
although the file will be recreated quickly by the system.

Also AcornDatabase.start now re-throws ProCoreException if
opening/locking the lock-file fails with IOException to prevent the
system from attempting to start up without a proper database to work
with. Previously the system just logged the start-up problem and
continued.

refs #7124

Change-Id: I850b47d8f692e3d1b8ce177b9269540edc4dc272

7 years agoFileImportService fails to match file extensions 96/496/1
Jussi Koskela [Tue, 9 May 2017 12:58:57 +0000 (15:58 +0300)]
FileImportService fails to match file extensions

Extensions always contain leading dot, so match accordingly. Remove
leading asterisk from candidates if one exists.

refs #7203

Change-Id: If8399760c70fcfc1f7822035fc971499621c72c7

7 years agoTry to acquire DB lock even if the lock file already exists 95/495/1
Jussi Koskela [Mon, 8 May 2017 10:14:49 +0000 (13:14 +0300)]
Try to acquire DB lock even if the lock file already exists

Lock file may already exist if the program crashed or was terminated
forcefully. It is ok to try acquiring the lock on existing lock file.

refs #7124

Change-Id: I1467dee3d889d18c68664f6df0b9fa9b13296351

7 years agoMerge changes I09c034e1,Ideac8aae,Ib7751212,Id09d9a3c,I39696ee5, ...
Tuukka Lehtonen [Sun, 7 May 2017 08:09:27 +0000 (11:09 +0300)]
Merge changes I09c034e1,Ideac8aae,Ib7751212,Id09d9a3c,I39696ee5, ...

* changes:
  Use ListIndexRoots in migration
  ListIndexRoots request
  SingletonRead base class
  GenericReadBase2 without the unused template parameter
  Initial selection for diagram viewer should be the diagram itself
  Support VP.Test in action browse context contribution
  InstanceOf tester (VP.Test)

7 years agoUse ListIndexRoots in migration 94/494/1
Antti Villberg [Sun, 7 May 2017 06:52:03 +0000 (09:52 +0300)]
Use ListIndexRoots in migration

refs #7198

Change-Id: I09c034e1723ec8bc35706d137f5a8c8cba96a44a

7 years agoListIndexRoots request 93/493/1
Antti Villberg [Sun, 7 May 2017 06:49:56 +0000 (09:49 +0300)]
ListIndexRoots request

refs #7197

Change-Id: Ideac8aaeb23154aa94d465b838903f4fa373a458

7 years agoSingletonRead base class 92/492/1
Antti Villberg [Sun, 7 May 2017 06:49:13 +0000 (09:49 +0300)]
SingletonRead base class

refs #7196

Change-Id: Ib7751212d5cad181c74a1680962e4c84a43e4ebb

7 years agoGenericReadBase2 without the unused template parameter 91/491/1
Antti Villberg [Sun, 7 May 2017 06:48:19 +0000 (09:48 +0300)]
GenericReadBase2 without the unused template parameter

refs #7195

Change-Id: Id09d9a3c8f2752fda0d2b846f69382249374704a

7 years agoInitial selection for diagram viewer should be the diagram itself 90/490/1
Antti Villberg [Sun, 7 May 2017 06:45:57 +0000 (09:45 +0300)]
Initial selection for diagram viewer should be the diagram itself

refs #7194

Change-Id: I39696ee530cd04fb91562400f0b4937b30a121c7

7 years agoSupport VP.Test in action browse context contribution 89/489/1
Antti Villberg [Sun, 7 May 2017 06:44:35 +0000 (09:44 +0300)]
Support VP.Test in action browse context contribution

refs #7193

Change-Id: If8237793dda6f6191e0aec06c30573cc2f97134f

7 years agoInstanceOf tester (VP.Test) 88/488/1
Antti Villberg [Sun, 7 May 2017 06:41:46 +0000 (09:41 +0300)]
InstanceOf tester (VP.Test)

refs #7192

Change-Id: Ife996f7b8dfa7d302877aef7dfad7f4bc711211d

7 years agoFixed bad bug related to AcornBackupProvider 85/485/3
Tuukka Lehtonen [Fri, 5 May 2017 13:59:12 +0000 (16:59 +0300)]
Fixed bad bug related to AcornBackupProvider

AcornBackupProvider was invoking GraphClientImpl2.makeSnapshot with true
parameter which caused the invocation to write the main.state file when
backups were made which was totally unintentional. The main.state file
is now only written only when the database session is shut down, i.e.
not at all in ClusterManager.makeSnapshot.

Also includes robustness fixes for Acorn database directory locking by
using the Java NIO API for atomic existence testing and creation of the
lock file.

refs #7186

Change-Id: Id668528f8aea789945a4ae3a212d14b07554ba0d

7 years agoChanged external reference flag texts to obey current name/label mode 86/486/2
Tuukka Lehtonen [Fri, 5 May 2017 14:25:08 +0000 (17:25 +0300)]
Changed external reference flag texts to obey current name/label mode

Text shown in external reference type diagram flags now obeys the
currently selected Name/Label model that can be controlled using code in
class org.simantics.NameLabelUtil.

Previously the text shown in normal diagram external reference flags was
always preferring to show the Label property of diagrams and related
modules and if labels were not defined, the Name property would be used
instead.

refs #7178

Change-Id: I85efb6e68f92fdb18d1445037da5285700ca5398

7 years agoFixed BrowseContext test code to work headlessly 83/483/2
Tuukka Lehtonen [Fri, 5 May 2017 10:41:01 +0000 (13:41 +0300)]
Fixed BrowseContext test code to work headlessly

Previous code invoked JFaceResources.getDefaultFontDescriptor which
eventually invoked Display.getCurrent which would assert out in a
headless test environment.

refs #7184

Change-Id: I59349b8845b8f41d96356764972abcac44d35022

7 years agoFixed bad logical bug from Acorn's MainState.load rollback 82/482/3
Tuukka Lehtonen [Thu, 4 May 2017 21:52:29 +0000 (00:52 +0300)]
Fixed bad logical bug from Acorn's MainState.load rollback

The major bug was the logical not in MainState.load rollback which
caused the database revisioning to be started from 0 when the database
was *not* empty. It should have been the other way around.

Also cleaned up the database head.state validation code by not using
exceptions for flow control in validating head.state files.

refs #7124

Change-Id: I7cd57fa73d39a637c71159df63566aed5063fc40

7 years agoMerge "(refs #7178) Validator for build.properties"
Hannu Niemistö [Thu, 4 May 2017 13:57:22 +0000 (16:57 +0300)]
Merge "(refs #7178) Validator for build.properties"

7 years ago(refs #7178) Validator for build.properties 81/481/1
Hannu Niemistö [Thu, 4 May 2017 13:23:24 +0000 (16:23 +0300)]
(refs #7178) Validator for build.properties

Checks that certain typical Simantics files exists in build.properties,
if they exist in the plugin.

Change-Id: I3e9303698d19a6f312c2cf2de213849a51744f04