simantics/platform.git
2 years agoisImmutable can NPE 58/758/2
Antti Villberg [Mon, 24 Jul 2017 12:54:19 +0000 (15:54 +0300)]
isImmutable can NPE

refs #7380

Change-Id: I8b1eac67b58664f0986dfeea5315f791721d8393

2 years ago(refs #7375) Fixed implementation of collectEffects 59/759/1
Hannu Niemistö [Mon, 24 Jul 2017 14:36:55 +0000 (17:36 +0300)]
(refs #7375) Fixed implementation of collectEffects

Change-Id: I25ebbb6b35e8d1828f36da5c55de8763364c8dd3

2 years ago(refs #7375) Replaced collectVars method by a visitor 56/756/1
Hannu Niemistö [Mon, 24 Jul 2017 12:08:41 +0000 (15:08 +0300)]
(refs #7375) Replaced collectVars method by a visitor

Change-Id: I4838702fadeca47449433693dae9630d5cac895d

2 years ago(refs #7375) Replaced collectFreeVariables method by a visitor 55/755/2
Hannu Niemistö [Mon, 24 Jul 2017 11:19:26 +0000 (14:19 +0300)]
(refs #7375) Replaced collectFreeVariables method by a visitor

Change-Id: I89817b8a075d6261b351fbbd70c40d9f9ccc59cc

2 years agoMerge "(refs #7375) Replaced collectEffects by CollectEffectsVisitor"
Hannu Niemistö [Mon, 24 Jul 2017 10:52:26 +0000 (13:52 +0300)]
Merge "(refs #7375) Replaced collectEffects by CollectEffectsVisitor"

2 years agoPreventing unnecessary ModuleSource compilation in SCL-editor 48/748/3
jsimomaa [Sun, 23 Jul 2017 15:39:38 +0000 (18:39 +0300)]
Preventing unnecessary ModuleSource compilation in SCL-editor

Current toTextualModuleSource() is called quite extensively when
isModifiable() is called. The module source can be cached as the input
of the editor does not tend to change

refs #7369

Change-Id: I671af197750301f8bffbb9624f58c5bab656e08b

2 years ago(refs #7375) Replaced collectEffects by CollectEffectsVisitor 53/753/1
Hannu Niemistö [Mon, 24 Jul 2017 10:02:04 +0000 (13:02 +0300)]
(refs #7375) Replaced collectEffects by CollectEffectsVisitor

Change-Id: I41b489ad872140bf7a0f0a83714a50431b48c3a6

2 years agoMerge "possibleVariable into Simantics/Variables"
Hannu Niemistö [Mon, 24 Jul 2017 10:01:47 +0000 (13:01 +0300)]
Merge "possibleVariable into Simantics/Variables"

2 years agopossibleVariable into Simantics/Variables 52/752/1
Antti Villberg [Mon, 24 Jul 2017 09:45:09 +0000 (12:45 +0300)]
possibleVariable into Simantics/Variables

#7379

Change-Id: I2fdfb4ed186f08262d0f220f112a29f0f825c401

2 years agoMerge "(refs #7375) Replace collectRefs by CollectRefsVisitor"
Hannu Niemistö [Mon, 24 Jul 2017 09:08:59 +0000 (12:08 +0300)]
Merge "(refs #7375) Replace collectRefs by CollectRefsVisitor"

2 years ago(refs #7375) Replace collectRefs by CollectRefsVisitor 51/751/1
Hannu Niemistö [Mon, 24 Jul 2017 08:15:12 +0000 (11:15 +0300)]
(refs #7375) Replace collectRefs by CollectRefsVisitor

Change-Id: I77bf548a062bb365f43284778845678fb50341d5

2 years agoMerge "(refs #7375) Replaced forVariables by a visitor"
Hannu Niemistö [Mon, 24 Jul 2017 07:53:07 +0000 (10:53 +0300)]
Merge "(refs #7375) Replaced forVariables by a visitor"

2 years ago(refs #7375) Replaced forVariables by a visitor 50/750/1
Hannu Niemistö [Mon, 24 Jul 2017 07:34:38 +0000 (10:34 +0300)]
(refs #7375) Replaced forVariables by a visitor

Change-Id: I5737e75491a1341711f89fbcf9749ee88d953c92

2 years agoUse single SCLOsgi.MODULE_REPOSITORY for ModelledSTSTest.run() 49/749/1
jsimomaa [Mon, 24 Jul 2017 06:56:44 +0000 (09:56 +0300)]
Use single SCLOsgi.MODULE_REPOSITORY for ModelledSTSTest.run()

refs #7378

Change-Id: Ib4a2b38cad5dbb275c2bdc69e89879878da72605

2 years agoBuiltins and JavaModule SCL modules may leak memory 35/735/4
jsimomaa [Thu, 20 Jul 2017 13:17:36 +0000 (16:17 +0300)]
Builtins and JavaModule SCL modules may leak memory

Still needs a better fix though

refs #7352

Change-Id: I9206376349bedf4a92763094b2859230dbf69f77

2 years agoMerge "CHR query translation and support for assignment in CHR bodies"
Hannu Niemistö [Sat, 22 Jul 2017 20:39:41 +0000 (23:39 +0300)]
Merge "CHR query translation and support for assignment in CHR bodies"

2 years agoSet sonar project version to 1.30.
Tuukka Lehtonen [Fri, 21 Jul 2017 21:07:38 +0000 (00:07 +0300)]
Set sonar project version to 1.30.

2 years agoCHR query translation and support for assignment in CHR bodies 43/743/1
Hannu Niemistö [Fri, 21 Jul 2017 13:22:19 +0000 (16:22 +0300)]
CHR query translation and support for assignment in CHR bodies

refs #7377

Change-Id: Ia9adf1cf52670c7a5de50210d7c155ff8bc4bf8d

2 years ago(refs #7377) Refactoring CHR query parsing
Hannu Niemistö [Fri, 21 Jul 2017 11:06:25 +0000 (14:06 +0300)]
(refs #7377) Refactoring CHR query parsing

Change-Id: Ia0e2e4589180505c02fabeb5b1dd2267825e3255

2 years ago(refs #7375) Replaced ExpressionDecorator by ExpressionTransformer 37/737/1
Hannu Niemistö [Fri, 21 Jul 2017 08:00:46 +0000 (11:00 +0300)]
(refs #7375) Replaced ExpressionDecorator by ExpressionTransformer

Change-Id: I4396a632a63902afd38065834d9c96c159bba9c1

2 years agoSCL REST API server 34/734/6
jsimomaa [Thu, 20 Jul 2017 11:59:19 +0000 (14:59 +0300)]
SCL REST API server

refs #7374

Change-Id: I24cf990d717cdc6bb3fc5bc44d4afdd39aade864

2 years agoUncommon Acorn deadlock fix 32/732/2
jsimomaa [Thu, 20 Jul 2017 06:53:12 +0000 (09:53 +0300)]
Uncommon Acorn deadlock fix

refs #7373

Change-Id: Ica31908fca0b70da87bbcf75deb2476bdf305cde

2 years ago(refs #7374) Created CommandSessionWithModules 33/733/1
Hannu Niemistö [Thu, 20 Jul 2017 08:28:54 +0000 (11:28 +0300)]
(refs #7374) Created CommandSessionWithModules

Change-Id: I6706caaf92018e4ccbf4ad11bd9a58789085fb6a

2 years agoMerge "(refs #7371) Support for select keyword for CHR constraints"
Hannu Niemistö [Thu, 20 Jul 2017 07:47:57 +0000 (10:47 +0300)]
Merge "(refs #7371) Support for select keyword for CHR constraints"

2 years agoImplementing Java camelCase breaking in SCL module editor 24/724/3
jsimomaa [Tue, 18 Jul 2017 12:45:03 +0000 (15:45 +0300)]
Implementing Java camelCase breaking in SCL module editor

This feature enables the behavior familiar from Eclipse's Java-editor
where CTRL (SHIFT) + RIGHT_ARROW/LEFT_ARROW navigate text

[EDIT] add missing MANIFEST.MF

refs #7369

Change-Id: I7c9a37107ad9530bd421360fe35479960cce4d28

2 years ago(refs #7371) Support for select keyword for CHR constraints 26/726/2
Hannu Niemistö [Wed, 19 Jul 2017 10:42:20 +0000 (13:42 +0300)]
(refs #7371) Support for select keyword for CHR constraints

Change-Id: Ie23a1cd698b230f9be05ff38c937cfcbd13d658b

2 years agoMerge "AbstractCompileStructuralValueRequest uses wrong RuntimeEnvironment"
Jani Simomaa [Mon, 17 Jul 2017 19:17:55 +0000 (22:17 +0300)]
Merge "AbstractCompileStructuralValueRequest uses wrong RuntimeEnvironment"

2 years agoIncrease the version number of org.simantics.document.server.io 02/702/2
jsimomaa [Sat, 8 Jul 2017 07:36:49 +0000 (10:36 +0300)]
Increase the version number of org.simantics.document.server.io

Increase the version number to fix simupedia git build problems

refs #6712 refs #7019

Change-Id: I45cd2268b8e24aea479c1901c30984e5b4464251

2 years ago(refs #7365) Fixed the bug in the test CHR11.scl 16/716/1
Hannu Niemistö [Sun, 16 Jul 2017 10:32:05 +0000 (13:32 +0300)]
(refs #7365) Fixed the bug in the test CHR11.scl

Change-Id: I961c3ae92013ec4085fe61eee9021a3cc0aff6e4

2 years ago(refs #7365) Unit test for the bug 15/715/1
Hannu Niemistö [Thu, 13 Jul 2017 11:56:46 +0000 (14:56 +0300)]
(refs #7365) Unit test for the bug

"CHR constraint from an included ruleset is activated multiple times"

Change-Id: If24b6b3251ad563ccc8f9db9c97c71279f688325

2 years agoAbstractCompileStructuralValueRequest uses wrong RuntimeEnvironment 12/712/1
jsimomaa [Wed, 12 Jul 2017 11:18:41 +0000 (14:18 +0300)]
AbstractCompileStructuralValueRequest uses wrong RuntimeEnvironment

refs #7363

Change-Id: I4b60a5cc4aefc65c86b88ff93fe8951f40bd1238

2 years ago(refs #7362) Creation of new SCL modules in SCL module browser 11/711/1
Hannu Niemistö [Wed, 12 Jul 2017 07:59:06 +0000 (10:59 +0300)]
(refs #7362) Creation of new SCL modules in SCL module browser

Change-Id: Ieb99edbd22db8092edd62449b739f6ae2b5824ab

2 years agoMarkdown to HTML generator has now genration options 10/710/1
Hannu Niemistö [Tue, 11 Jul 2017 12:20:12 +0000 (15:20 +0300)]
Markdown to HTML generator has now genration options

Change-Id: Ifcb03519f497f32f2cbd870743ba3e349887cdab

2 years agoUpdated CommonMark specification, used only for tests 03/703/1
Hannu Niemistö [Sun, 9 Jul 2017 06:38:20 +0000 (09:38 +0300)]
Updated CommonMark specification, used only for tests

Change-Id: Ib1f51968ea008a36d1b1492c57d5b9750d29c1e0

2 years agoDynamic terminals and connections 83/683/1
jsimomaa [Fri, 7 Jul 2017 06:32:24 +0000 (09:32 +0300)]
Dynamic terminals and connections

Change-Id: I15242c8bf58a5b16529f924987fd8bf51cf69d0b

2 years agoMerge "OptionGroup: fixed Names field & ListItem disabled / selected flags"
Tuukka Lehtonen [Wed, 5 Jul 2017 08:05:47 +0000 (11:05 +0300)]
Merge "OptionGroup: fixed Names field & ListItem disabled / selected flags"

2 years agoOptionGroup: fixed Names field & ListItem disabled / selected flags 79/679/1
Marko Luukkainen [Wed, 5 Jul 2017 07:49:20 +0000 (10:49 +0300)]
OptionGroup: fixed Names field & ListItem disabled / selected flags

refs #7351

Change-Id: I5bcd192a1785eacdf9731d33d865981ad181d4e6

2 years agoMerge "Fixed diagram copy/paste implementations to re-identify diagram elements"
Tuukka Lehtonen [Wed, 5 Jul 2017 07:37:28 +0000 (10:37 +0300)]
Merge "Fixed diagram copy/paste implementations to re-identify diagram elements"

2 years agoMerge "Added memory leak test and fixed the leak by removing references"
Hannu Niemistö [Wed, 5 Jul 2017 07:33:25 +0000 (10:33 +0300)]
Merge "Added memory leak test and fixed the leak by removing references"

2 years agoFixed diagram copy/paste implementations to re-identify diagram elements 78/678/2
Tuukka Lehtonen [Tue, 4 Jul 2017 10:57:34 +0000 (13:57 +0300)]
Fixed diagram copy/paste implementations to re-identify diagram elements

Previously copying elements within or between diagram editors and also
copying diagrams in the model browser would preserve GUID identifiers
for the diagram ordered set structure itself and all its elements. The
correct behavior is now implemented which is to force the system to
generate new GUID identifiers for all copied structures that have
identifiers.

refs #7348

Change-Id: I811bb4a118ffb9321577ef46f6651459379cdd08

2 years ago(refs #7322) Implemented visitors for CHRStatement 77/677/1
Hannu Niemistö [Tue, 4 Jul 2017 10:15:25 +0000 (13:15 +0300)]
(refs #7322) Implemented visitors for CHRStatement

Change-Id: I2f1b3b48fbb2060ba894cf209a9053a42bdf6560

2 years agoAdded memory leak test and fixed the leak by removing references 76/676/1
Hannu Niemistö [Tue, 4 Jul 2017 09:44:40 +0000 (12:44 +0300)]
Added memory leak test and fixed the leak by removing references

refs #7352

Change-Id: Idc412759d49314f3226e6b1648881aaab8248fe9

2 years agoDelete temporary files after use in delayed writes and model TG export 69/669/3
Tuukka Lehtonen [Mon, 3 Jul 2017 21:09:51 +0000 (00:09 +0300)]
Delete temporary files after use in delayed writes and model TG export

Also, delayed writes no longer create temporary files for commits that
create under 512KB of committed data.

refs #7091
refs #7092

Change-Id: Iff75738b9cc41a52eb88df32b51ddc7cd8af812d

2 years agoFixed changes made in commit 3a10ce85. 75/675/2
Tuukka Lehtonen [Mon, 3 Jul 2017 20:46:20 +0000 (23:46 +0300)]
Fixed changes made in commit 3a10ce85.

refs #7339

Change-Id: Ib47a5eb67c83a716d82526a5f61c303d9e34f235

2 years agoMerge "Add hashcodes from URI's as id if no component is found for SVG print"
Tuukka Lehtonen [Mon, 3 Jul 2017 20:34:07 +0000 (23:34 +0300)]
Merge "Add hashcodes from URI's as id if no component is found for SVG print"

2 years agoAdd hashcodes from URI's as id if no component is found for SVG print 74/674/5
jsimomaa [Mon, 3 Jul 2017 18:46:33 +0000 (21:46 +0300)]
Add hashcodes from URI's as id if no component is found for SVG print

Change-Id: If278ef81d6006aff9ac487e2d34f014e0b671f28

2 years agoFixed ResourceEditorSupport.scheduleEditorClose wrong thread invocation 72/672/2
Tuukka Lehtonen [Mon, 3 Jul 2017 15:44:05 +0000 (18:44 +0300)]
Fixed ResourceEditorSupport.scheduleEditorClose wrong thread invocation

Now using safer means to gain access to an editor's containing shell
than previously.

refs #7349

Change-Id: I0c5ff9711703608fd34a17cc474ed9490e5ab4d5

2 years agoRouteGraphUtils.readConnectionStyle returns default value if necessary 71/671/2
Tuukka Lehtonen [Mon, 3 Jul 2017 15:39:32 +0000 (18:39 +0300)]
RouteGraphUtils.readConnectionStyle returns default value if necessary

Fixed problems in casting to BasicConnectionStyle introduced in commit
e571f799.

refs #7323

Change-Id: I22a74322c44764da6fba61d6af5c16a4f71c712e

2 years agoIgnore ModuleCompilationOptions 73/673/1
jsimomaa [Mon, 3 Jul 2017 18:24:36 +0000 (21:24 +0300)]
Ignore ModuleCompilationOptions

for now until UnsupportedOperationException in CHR is fixed..

Change-Id: I701cc6156a2f02b6eb2b5f84949f961a340dd286

2 years agoDiagram to SVG enhancements and stabilization 65/665/2
jsimomaa [Thu, 29 Jun 2017 11:06:32 +0000 (14:06 +0300)]
Diagram to SVG enhancements and stabilization

* Introducing the possibility to map component identifiers from default
to something else in order to stabilize SVG printing of same diagrams in
different databases

refs #7340

Change-Id: I2338703a4b0e04fe1680854f749c9e8a28db134e

2 years ago(refs #7346) Give a proper error message about unresolved relations 70/670/1
Hannu Niemistö [Mon, 3 Jul 2017 08:35:12 +0000 (11:35 +0300)]
(refs #7346) Give a proper error message about unresolved relations

Change-Id: I0819c0cbc1c58e1090ac79f8457bcf308796cd23

2 years agoReduce the amount of annoying Retry mutex acquire print 39/639/4
jsimomaa [Mon, 19 Jun 2017 05:43:05 +0000 (08:43 +0300)]
Reduce the amount of annoying Retry mutex acquire print

refs #7175

Change-Id: If9505ec6b79aeee38971f523bb6f1909493abd81

2 years agoMerge "View for used SCL expressions"
Tuukka Lehtonen [Fri, 30 Jun 2017 11:52:55 +0000 (14:52 +0300)]
Merge "View for used SCL expressions"

2 years agoView for used SCL expressions 68/668/2
jsimomaa [Fri, 30 Jun 2017 10:30:57 +0000 (13:30 +0300)]
View for used SCL expressions

refs #7344

Change-Id: Ic2e902fc9742afce80e1ead764528e8eb35704a6

2 years agoPolling and pollingfunction fixes 66/666/3
Miro Richard Eklund [Fri, 30 Jun 2017 09:04:33 +0000 (12:04 +0300)]
Polling and pollingfunction fixes

Added primitivevaluevariable and handles polling function issues.

Amend: Removed syserr printline and put stackstace to logger.

refs #7342

Change-Id: Iba326499fe5bc00d6a512fc290420ba735d62642

2 years agoLayer0Utils.addL0Identifier to prevent possible differentiation of code 64/664/2
jsimomaa [Thu, 29 Jun 2017 10:59:41 +0000 (13:59 +0300)]
Layer0Utils.addL0Identifier to prevent possible differentiation of code

refs #7339

Change-Id: Idfe7a61e1baacbeb782317f0cc0688ee5d0c4a9b

2 years agoUse parent name in JUnit STS test identifiers 63/663/2
jsimomaa [Thu, 29 Jun 2017 10:55:46 +0000 (13:55 +0300)]
Use parent name in JUnit STS test identifiers

Previous implementation groups all tests under
ModelledSTSTestRunner.class.getName() which is not desired with modelled
STS tests

refs #7338

Change-Id: Iead3594ef081fa82071ccc30a9f4a33dcd3d7ceb

2 years agoLayer0Utils.claimAdaptedValue does not support type adapting 62/662/1
jsimomaa [Thu, 29 Jun 2017 05:09:43 +0000 (08:09 +0300)]
Layer0Utils.claimAdaptedValue does not support type adapting

refs #7336

Change-Id: I31cf518661eaf30dd1484bdba812c4c3b0d9db4d

2 years agoCommonDBUtils possibleRelatedString/Integer were not "possible" 61/661/1
jsimomaa [Thu, 29 Jun 2017 05:04:38 +0000 (08:04 +0300)]
CommonDBUtils possibleRelatedString/Integer were not "possible"

refs #7335

Change-Id: Ia71f156e7c3b047582d5568343d8782003af7025

2 years agoFixing Shared libraries property tab to list shared libraries 58/658/1
jsimomaa [Wed, 28 Jun 2017 04:33:09 +0000 (07:33 +0300)]
Fixing Shared libraries property tab to list shared libraries

Due to changes made in #7303 shared libraries were not listed in Shared
libraries property tab

refs #7334

Change-Id: I0c7d33237157005d06ce70ee3968b781ab1207cd

2 years agoAdded two missing features to org.simantics.sdk feature 55/655/1
Tuukka Lehtonen [Tue, 27 Jun 2017 10:09:05 +0000 (13:09 +0300)]
Added two missing features to org.simantics.sdk feature

The two missing features are org.apache.lucene4 and com.lowagie.text
which are included by org.simantics.db.client org.simantics.modeling
features respectively.

refs #7332

Change-Id: I60265627d442ce62720c859b593feb207e679e0b

2 years agoAdded README for target platform definition files 54/654/1
Tuukka Lehtonen [Mon, 26 Jun 2017 14:49:55 +0000 (17:49 +0300)]
Added README for target platform definition files

refs #7263

Change-Id: Idc8b8a8d87cc1b38be8cd2b963ba577a2fa30b05

2 years agoMerge "Ordering of RouteGraphs RouteLines is nondeterministic"
Tuukka Lehtonen [Mon, 26 Jun 2017 06:20:15 +0000 (09:20 +0300)]
Merge "Ordering of RouteGraphs RouteLines is nondeterministic"

2 years agoAdded DirectorySizeTracker for tracking total size of a directory tree 53/653/2
Tuukka Lehtonen [Sun, 25 Jun 2017 22:45:02 +0000 (01:45 +0300)]
Added DirectorySizeTracker for tracking total size of a directory tree

The implementation is based on the Java 7 NIO WatchService API.

refs #7330

Change-Id: I257649ed1ea88f53f88c45ac3177dce544527ade

2 years agoOrdering of RouteGraphs RouteLines is nondeterministic 52/652/1
jsimomaa [Sat, 24 Jun 2017 19:30:24 +0000 (22:30 +0300)]
Ordering of RouteGraphs RouteLines is nondeterministic

refs #7320

Change-Id: Ibac54bc6d16578e812542360573cb0836db7deab

2 years agoFixed URIDocumentRequest to work also without IConsoleSupport. 50/650/1
Tuukka Lehtonen [Fri, 23 Jun 2017 07:52:31 +0000 (10:52 +0300)]
Fixed URIDocumentRequest to work also without IConsoleSupport.

refs #7329

Change-Id: Ie84d3ae1e2213fe7656c30e573f71bceda3c1b96

2 years agoAllow external customization fo TG Root type URIs. 49/649/1
Tuukka Lehtonen [Wed, 21 Jun 2017 20:57:13 +0000 (23:57 +0300)]
Allow external customization fo TG Root type URIs.

The customization happens by writing the type URIs into
TransferableGraphConfiguration2.RootSpec instances which then get
translated into TG Root identity definitions by
ModelTransferableGraphSource.

refs #7328

Change-Id: I3ba23ac39009ecc6486b4ef55ead4d5971e5f130
(manually picked from commit f0546930e05223a2575b37ff9a6de08322542b5c)

2 years ago(refs #7326) Better handling of exceptions in Java->SCL interface 46/646/1
Hannu Niemistö [Wed, 21 Jun 2017 13:23:47 +0000 (16:23 +0300)]
(refs #7326) Better handling of exceptions in Java->SCL interface

Change-Id: I31573bc72f48d601c7f92faa491e59594eefdf59

2 years ago(refs #7325) Fixed incorrect call of write in FilterCRWriter 45/645/1
Hannu Niemistö [Wed, 21 Jun 2017 12:19:19 +0000 (15:19 +0300)]
(refs #7325) Fixed incorrect call of write in FilterCRWriter

Change-Id: Ifecf88cd5239301b25a19846fec8fa39f6821857

2 years agoFixed org.simantics.data feature to include two missing dependencies 44/644/1
Tuukka Lehtonen [Tue, 20 Jun 2017 09:38:08 +0000 (12:38 +0300)]
Fixed org.simantics.data feature to include two missing dependencies

org.simantics.databoard depends on org.apache.commons.collections
[3.2.1,) and gnu.trove3.

refs #7324

Change-Id: Ie06ea17fc92a3df4ce584612a18748307ad7186b

2 years agoRouteGraphUtils.readConnectionStyle returns default value if necessary 43/643/1
Tuukka Lehtonen [Tue, 20 Jun 2017 06:29:08 +0000 (09:29 +0300)]
RouteGraphUtils.readConnectionStyle returns default value if necessary

Previously the code would crash with NPE if the ontology/model was not
created to contain STR.HasConnectionType information accordingly. Now it
will just return ExampleConnectionStyle if there is no modelled
information available.

refs #7323

Change-Id: I3d5b5ba6a4e615d7ae120e42aa003c787617b8d0

2 years agoPrint AssertionError to SCLReportingHandler
jsimomaa [Mon, 19 Jun 2017 13:30:03 +0000 (16:30 +0300)]
Print AssertionError to SCLReportingHandler

refs #7319

Change-Id: Idb97cbec59532d8a48db8f5e412a7df036a2c510

2 years agoAdd .gitkeep files to ontology plugins src-folders 40/640/1
jsimomaa [Mon, 19 Jun 2017 09:03:08 +0000 (12:03 +0300)]
Add .gitkeep files to ontology plugins src-folders

refs #7317

Change-Id: Iad353904a36c1832837feb0b0f235e87962bd9d1

2 years agoMore meaningful debug printing to PrettyPrintTG 38/638/1
jsimomaa [Mon, 19 Jun 2017 05:35:32 +0000 (08:35 +0300)]
More meaningful debug printing to PrettyPrintTG

Also removing commented out code

refs #7276

Change-Id: I1aee2b8424444a7ee0b3a08be31dbc3375b3e21f

2 years agoMerge "(refs #7316) Improved error locations for invalid field access"
Hannu Niemistö [Sun, 18 Jun 2017 20:37:45 +0000 (23:37 +0300)]
Merge "(refs #7316) Improved error locations for invalid field access"

2 years ago(refs #7316) Improved error locations for invalid field access 37/637/1
Hannu Niemistö [Sun, 18 Jun 2017 17:58:11 +0000 (20:58 +0300)]
(refs #7316) Improved error locations for invalid field access

Change-Id: Ie901cd59e0cf45ece1c99932d44ac1863da97565

2 years agoFixes to SCLLabelRule definitions 36/636/1
Antti Villberg [Sun, 18 Jun 2017 06:43:10 +0000 (09:43 +0300)]
Fixes to SCLLabelRule definitions

refs #7315

Change-Id: I9e1ae08ab39a440c60e5abf3d37edfeb4419e96f

2 years agoFixed diagram profile monitor DnD regression. 35/635/1
Tuukka Lehtonen [Fri, 16 Jun 2017 09:34:43 +0000 (12:34 +0300)]
Fixed diagram profile monitor DnD regression.

CTRL+dragging diagram profile monitor values from diagram to Model
Browser chart/subscription nodes now works again. The code now processes
also dragged data that contains an RVI in String format.

refs #7313

Change-Id: I0154414df73ea96c29a8e5aa44881781f5d62675
(cherry picked from commit b9d4701787a7aba852ec02aaef6149b8203344b3)

2 years agoDocumentRequest performance enhancements (Simupedia) 28/628/4
Antti Villberg [Thu, 15 Jun 2017 03:26:13 +0000 (06:26 +0300)]
DocumentRequest performance enhancements (Simupedia)

refs #7303

Change-Id: I719ac5a0c0c1dc02850d5ed140e7234ae280cdf6

2 years agoMerge "Revert "Default property editing restores assertions""
Tuukka Lehtonen [Fri, 16 Jun 2017 07:43:04 +0000 (10:43 +0300)]
Merge "Revert "Default property editing restores assertions""

2 years agoRevert "Default property editing restores assertions" 32/632/1
Tuukka Lehtonen [Fri, 16 Jun 2017 07:15:37 +0000 (10:15 +0300)]
Revert "Default property editing restores assertions"

This reverts commit c4c152bf639475b85efad1e8bd6ea007c08a9e1f.

Reason: If user has set the value of a property to X, he expects it to stay as X until all eternity instead of the value changing when the assertions in the ontology change.

refs #7302

Change-Id: I5cd33d17413b118f522456b37b27df757f42861b

2 years agoMerge "Default property editing restores assertions"
Tuukka Lehtonen [Fri, 16 Jun 2017 07:09:47 +0000 (10:09 +0300)]
Merge "Default property editing restores assertions"

2 years agoFixing exclude filter bug & adding query cache flushing 31/631/2
jsimomaa [Thu, 15 Jun 2017 10:13:43 +0000 (13:13 +0300)]
Fixing exclude filter bug & adding query cache flushing

refs #7305

Change-Id: I16b48b8d0aa4cb19a1cbc60084d046ec83d20187

2 years agoFixing PrettyPrintTG to not concatenate strings in logging 30/630/2
jsimomaa [Thu, 15 Jun 2017 07:29:30 +0000 (10:29 +0300)]
Fixing PrettyPrintTG to not concatenate strings in logging

However, creates unnecessary Object[] now..

refs #7276

Change-Id: Icc78a9c39f147f52f5b75ed5b7fcedf200293ea8

2 years agoMerge "(refs #7307) Added features field to SCL module header"
Tuukka Lehtonen [Thu, 15 Jun 2017 07:45:30 +0000 (10:45 +0300)]
Merge "(refs #7307) Added features field to SCL module header"

2 years ago(refs #7307) Added features field to SCL module header 29/629/1
Hannu Niemistö [Thu, 15 Jun 2017 07:14:11 +0000 (10:14 +0300)]
(refs #7307) Added features field to SCL module header

SCL language features are now enabled in the module header with syntax
module { features = [chr, fields] }
instead of
module { chr, fields }

Change-Id: Ibc533bc246efb29313e66576988913b09839b380

2 years agoTransferableGraphUtils.getObjects2 for fixing not-found handling
jsimomaa [Thu, 15 Jun 2017 06:32:53 +0000 (09:32 +0300)]
TransferableGraphUtils.getObjects2 for fixing not-found handling

refs #7306

Change-Id: I1d8dfefb51d579b1cb5ca9e15df82c0a8e347619

2 years agoLots of fixes for PrettyPrintTG
jsimomaa [Thu, 15 Jun 2017 06:30:44 +0000 (09:30 +0300)]
Lots of fixes for PrettyPrintTG

* Ordering predicates alphanumerically for deterministic ordering
between two databases
* Filtering L0.identifier statements
* Hash-based naming for blanks for ordering output print

Still needs some optimiziations to improve performance lost with these
changes..

refs #7276

Change-Id: I6848b319094863a8c85e4deca91df721b1642ce7

2 years agoAdd inclusion filter to modelled STS tests
jsimomaa [Thu, 15 Jun 2017 06:27:10 +0000 (09:27 +0300)]
Add inclusion filter to modelled STS tests

refs #7305

Change-Id: Iad8b19ceddaad0c493a2b8a8b5d267ab0abb0a8a

2 years agoSome minor fixes for pretty printing TG
jsimomaa [Mon, 12 Jun 2017 09:59:48 +0000 (12:59 +0300)]
Some minor fixes for pretty printing TG

#7276

Change-Id: I838c99e0151c68e8efc9c54189cc1c94e26f55c2

2 years agoDefault property editing restores assertions 27/627/1
Antti Villberg [Thu, 15 Jun 2017 03:22:24 +0000 (06:22 +0300)]
Default property editing restores assertions

refs #7302

Change-Id: I6e3b189cae025bcea85ae1265b4c80ade2dc9d16

2 years agoMerge "(refs #7298) Automatic refresh to SCL Console"
Tuukka Lehtonen [Wed, 14 Jun 2017 20:37:49 +0000 (23:37 +0300)]
Merge "(refs #7298) Automatic refresh to SCL Console"

2 years ago(refs #7298) Automatic refresh to SCL Console 22/622/2
Hannu Niemistö [Wed, 14 Jun 2017 07:43:10 +0000 (10:43 +0300)]
(refs #7298) Automatic refresh to SCL Console

Change-Id: I2799a6d1afa3d3e4724c55dda81ef88cc06b975e

2 years agoImproved PDF diagram export wizard user experience 26/626/4
Tuukka Lehtonen [Wed, 14 Jun 2017 16:45:36 +0000 (19:45 +0300)]
Improved PDF diagram export wizard user experience

* Page number addition is now an option in the wizard page
* The diagram selection tree no longer automatically expands itself
  fully when any node is (un)checked. Automatic expansion is only done
  up to the second node level only.
* The diagram filter now works with a 500ms quiet time delay which means
  writing in the filter shouldn't slow down the UI like it used to.
* Initial selection is more properly taken into account when
  initializing the wizard page. The containing model/index root is
  always sought based on the selection and the diagrams contained by the
  selected resource are then initially selected for that model in the
  diagram list.
* The Select/Deselect Visible buttons have been removed and Expand and
  Collapse buttons have been added instead for expanding and collapsing
  the selected tree nodes.
* The Select All and Deselect All buttons now work differently. If any
  filter is applied to the current tree view, only the diagrams shown in
  the tree are selected/deselected when either button is pressed. If no
  filter is applied, all diagrams will be selected/deselected.

refs #7297

Change-Id: I078a80528ba91c337f9921422d08a75c95cad45f

2 years agoAdded URIUtil.encodeFilename2 which encodes only necessary characters. 25/625/2
Tuukka Lehtonen [Wed, 14 Jun 2017 16:22:30 +0000 (19:22 +0300)]
Added URIUtil.encodeFilename2 which encodes only necessary characters.

The new method uses the same '%' URI style encoding as
URIUtil.encodeFilename but encodes only characters that cannot be
present in Windows file names, i.e. the following: <>:"/\|?*

This method can be used to convert arbitrary user-given names to valid
file names in wizards etc.

refs #7301

Change-Id: Ia7e264e5304ff0533376c73f5ae9312e197ccf15

2 years agoUse proper URI encoding/decoding in fail-safe import 24/624/1
Jussi Koskela [Wed, 14 Jun 2017 13:01:51 +0000 (16:01 +0300)]
Use proper URI encoding/decoding in fail-safe import

Earlier implementation didn't handle correctly cases where missing
resources had slashes in their names. Also fixed error reporting logic
to not remove error messages from sibling resources with matching
prefix.

refs #7300
Change-Id: Ia3ff0b09e592ff63fbb2872fa9329c3a471ed382

2 years agoFixed URI of the root resource in fail-safe import 23/623/1
Jussi Koskela [Wed, 14 Jun 2017 12:08:03 +0000 (15:08 +0300)]
Fixed URI of the root resource in fail-safe import

URIStringUtils.splitURI returns root URI in non-standard format, so fix
it manually as a workaround. Otherwise ExternalEntities cannot be
created under the root resource.

refs #7299
Change-Id: Ie548eebba5c267617cb845df684b025b59c069f5

2 years ago(refs #7296) Improvements to SCL module tree 21/621/1
Hannu Niemistö [Tue, 13 Jun 2017 12:08:33 +0000 (15:08 +0300)]
(refs #7296) Improvements to SCL module tree

Separate folder for StandardLibrary. Handling of module names starting
with http://.

Change-Id: I695e6ca75a06b636c33e63cab259334ea989a429

2 years agoFix stackoverflow from excel import 20/620/2
jsimomaa [Tue, 13 Jun 2017 04:47:11 +0000 (07:47 +0300)]
Fix stackoverflow from excel import

refs #7295

Change-Id: I4a6815fa42ccd4d337f37ff0f527e0d46a129598

2 years agoEditor for modelled STS variables for easier debugging 19/619/2
jsimomaa [Mon, 12 Jun 2017 10:01:05 +0000 (13:01 +0300)]
Editor for modelled STS variables for easier debugging

refs #7294

Change-Id: Ie100c751bf2e6e1cf8b173dd02de724959aadcc3