]> gerrit.simantics Code Review - simantics/platform.git/log
simantics/platform.git
6 years agoAllow contributing os.selectionview.SelectionProcessors from ontologies 48/948/2
Tuukka Lehtonen [Mon, 11 Sep 2017 21:00:10 +0000 (00:00 +0300)]
Allow contributing os.selectionview.SelectionProcessors from ontologies

refs #7478

Change-Id: I647f4dda8b7dd125cd83624741fe0d6d87c818df

6 years agoIcon support in IListItem 50/950/2
Antti Villberg [Tue, 12 Sep 2017 04:10:52 +0000 (07:10 +0300)]
Icon support in IListItem

refs #7480

Change-Id: I98fde337d3f5064c6907cea3f00c535145f73211

6 years agoAdded ListUtils.create alternatives that work with WriteOnlyGraph 47/947/2
Tuukka Lehtonen [Mon, 11 Sep 2017 08:49:03 +0000 (11:49 +0300)]
Added ListUtils.create alternatives that work with WriteOnlyGraph

This allows those functions to work with DelayedWrites as well.

refs #7477

Change-Id: I88a9de053783f05db85ecad8d1c6290e4ebc8258

6 years agoAdding missing simantics.target with correct jackson versions 45/945/1
jsimomaa [Fri, 8 Sep 2017 09:55:20 +0000 (12:55 +0300)]
Adding missing simantics.target with correct jackson versions

refs #7447

Change-Id: Ideba2d347257dd122cd161fbf889f4f94b5b0781

6 years agoGetting rid of multiple jackson versions 40/940/1
jsimomaa [Thu, 7 Sep 2017 13:22:52 +0000 (16:22 +0300)]
Getting rid of multiple jackson versions

Update target platform

refs #7447

Change-Id: I407b76d0c7df9f291f42eb3eb66ef0ce0045dd20

6 years agoGetting rid of multiple jackson versions 39/939/1
jsimomaa [Thu, 7 Sep 2017 13:16:55 +0000 (16:16 +0300)]
Getting rid of multiple jackson versions

refs #7447

Change-Id: Ic41dd09b47cdc766bdd5a2d2c6b356a273672c6c

6 years agoSpecify exported package version to org.slf4j.api 35/935/1
jsimomaa [Thu, 7 Sep 2017 08:07:38 +0000 (11:07 +0300)]
Specify exported package version to org.slf4j.api

refs #7474

Change-Id: I4b7d8f3a5ed87290db38dffc0f247072ce0e1354

6 years ago(refs #7470) SCL function for migrating all instances of component type 27/927/1
Hannu Niemistö [Wed, 6 Sep 2017 13:09:07 +0000 (16:09 +0300)]
(refs #7470) SCL function for migrating all instances of component type

Change-Id: I8b2e7252702bd0c7d938b74239f024f5d5ac088a

6 years agoBetter support for ontological profiles 19/919/5
Antti Villberg [Tue, 5 Sep 2017 18:05:51 +0000 (21:05 +0300)]
Better support for ontological profiles

refs #7465

Change-Id: I6b832067db3a7db4903934c97b4c9e48ee301c0a

6 years agoMerge "More descriptive label for PlatformUI shared ontology"
Tuukka Lehtonen [Wed, 6 Sep 2017 08:01:47 +0000 (11:01 +0300)]
Merge "More descriptive label for PlatformUI shared ontology"

6 years agoMerge "Font property for DIA.TextElement"
Hannu Niemistö [Wed, 6 Sep 2017 07:50:52 +0000 (10:50 +0300)]
Merge "Font property for DIA.TextElement"

6 years agoMore descriptive label for PlatformUI shared ontology 20/920/2
Antti Villberg [Wed, 6 Sep 2017 06:10:38 +0000 (09:10 +0300)]
More descriptive label for PlatformUI shared ontology

refs #7467

Change-Id: I857a64799847f6c7768ee78f3092368c5bea43b6

6 years agoImproved target platform related README.md 21/921/2
Tuukka Lehtonen [Wed, 6 Sep 2017 06:52:46 +0000 (09:52 +0300)]
Improved target platform related README.md

Added more information on the .tpd tool.

Change-Id: Ic56ff8a1bd3603beed980d336c8f8db6acbb51b6

6 years agoFont property for DIA.TextElement 17/917/4
Antti Villberg [Tue, 5 Sep 2017 12:13:51 +0000 (15:13 +0300)]
Font property for DIA.TextElement

refs #7466

Change-Id: I3ee21138f8488d207ec07a00f6ceaf177880577f

6 years ago(refs #7461) Fix to StructuralRVIResolver.getPossibleRVI 18/918/1
Hannu Niemistö [Tue, 5 Sep 2017 14:13:53 +0000 (17:13 +0300)]
(refs #7461) Fix to StructuralRVIResolver.getPossibleRVI

Call getPossibleRVI instead of getRVI.

Change-Id: I1638f0a08c78ac784f7c3d2e3a6f9ce4e9670f43

6 years agoBetter support for ontological profiles 16/916/2
Antti Villberg [Tue, 5 Sep 2017 10:01:50 +0000 (13:01 +0300)]
Better support for ontological profiles

refs #7465

Change-Id: I53e4dcdd4c0ffde62cf231bbcbde325e585096f9

6 years ago(refs #7464) Fixed SWTKeyEventAdapter for producing '*' 15/915/3
Hannu Niemistö [Tue, 5 Sep 2017 09:26:50 +0000 (12:26 +0300)]
(refs #7464) Fixed SWTKeyEventAdapter for producing '*'

Change-Id: I53497ff8a7999e69c3e9a906d02dd4b229486435

6 years agoLink PlatformUI Model to the ontology 14/914/2
Antti Villberg [Mon, 4 Sep 2017 17:09:28 +0000 (20:09 +0300)]
Link PlatformUI Model to the ontology

refs #7463

Change-Id: Iadcf1be0ac64e468ff758e0a5715079b8199ec12

6 years agoPublish OntologicalRequirementTracker as LifeCycleProcess 13/913/3
Antti Villberg [Mon, 4 Sep 2017 17:08:18 +0000 (20:08 +0300)]
Publish OntologicalRequirementTracker as LifeCycleProcess

refs #7462

Change-Id: Id29b225c3e7556a3afc5c4df54ed3a87a48c7908

6 years agoMerge "Editing of texts inside SVG elements"
Tuukka Lehtonen [Mon, 4 Sep 2017 19:41:55 +0000 (22:41 +0300)]
Merge "Editing of texts inside SVG elements"

6 years agoEditing of texts inside SVG elements 99/899/7
Antti Villberg [Fri, 1 Sep 2017 10:57:05 +0000 (13:57 +0300)]
Editing of texts inside SVG elements

refs #7458

Change-Id: Ied21d5c7706f2fa7c060088b5b57c46ee17977b2

6 years ago(refs #7461) Implemented StructuralRVIResolver.getPossibleRVI 12/912/1
Hannu Niemistö [Mon, 4 Sep 2017 15:42:48 +0000 (18:42 +0300)]
(refs #7461) Implemented StructuralRVIResolver.getPossibleRVI

Change-Id: I451d37af2cc532332c8de3d7c6401afda23bd969

6 years agoChange jersey back to 2.25.1 from 2.26 to fix resource-locator problems 10/910/1
jsimomaa [Mon, 4 Sep 2017 09:45:30 +0000 (12:45 +0300)]
Change jersey back to 2.25.1 from 2.26 to fix resource-locator problems

update target platform

refs #7447

Change-Id: Ie0a5cab6c7e31f2be2232ddf3067c503467d15b9

6 years agoChange jersey back to 2.25.1 from 2.26 to fix resource-locator problems 08/908/1
jsimomaa [Mon, 4 Sep 2017 09:19:02 +0000 (12:19 +0300)]
Change jersey back to 2.25.1 from 2.26 to fix resource-locator problems

update target platform

refs #7447

Change-Id: I3d056d366d700824a59a2db2e5781dc67a7749ce

6 years agoChange jersey back to 2.25.1 from 2.26 to fix resource-locator problems 07/907/1
jsimomaa [Mon, 4 Sep 2017 09:13:24 +0000 (12:13 +0300)]
Change jersey back to 2.25.1 from 2.26 to fix resource-locator problems

refs #7447

Change-Id: I475e7d6505dbae9a1b2612a46a77756545aab1ec

6 years agoChange jersey back to 2.25.1 from 2.26 to fix resource-locator problems 06/906/1
jsimomaa [Mon, 4 Sep 2017 09:11:32 +0000 (12:11 +0300)]
Change jersey back to 2.25.1 from 2.26 to fix resource-locator problems

refs #7447

Change-Id: I9f4181d2ff9ad9753703a9e603eb6059e43d0bf6

6 years ago(refs #7460) Prevent NPE if variable type is null. 04/904/1
Hannu Niemistö [Sun, 3 Sep 2017 08:12:15 +0000 (11:12 +0300)]
(refs #7460) Prevent NPE if variable type is null.

This may happen, if the variable is defined in a pattern and
the pattern type checking is not finished because of a type error.

Change-Id: I91aa4c7938769f84388fbc18f089b662e3ddcb9d

6 years ago(refs #7459) Fixed check for alread defined value name in the module. 02/902/2
Hannu Niemistö [Fri, 1 Sep 2017 13:03:24 +0000 (16:03 +0300)]
(refs #7459) Fixed check for alread defined value name in the module.

Change-Id: I2826c194a0210da4b63746caa7ea92e2e6e60d26

6 years agoFixed function name clash in Simantics/DB#createList 01/901/1
Tuukka Lehtonen [Fri, 1 Sep 2017 13:00:37 +0000 (16:00 +0300)]
Fixed function name clash in Simantics/DB#createList

The second createList is now createListWithType which takes the type of
the list as the first argument.

refs #7390

Change-Id: I8b52f792cb683bfc764ecd7a53bfb9b0c76b4d5f

6 years ago(refs #7457) Make default ComponentType name prefix an assertion 97/897/4
Hannu Niemistö [Thu, 31 Aug 2017 08:06:08 +0000 (11:06 +0300)]
(refs #7457) Make default ComponentType name prefix an assertion

Change-Id: I245960d29a5ac7a27af568174f5d62669382ad68

6 years ago(refs #7456) Automatic activation of model after import 96/896/2
Hannu Niemistö [Thu, 31 Aug 2017 07:33:52 +0000 (10:33 +0300)]
(refs #7456) Automatic activation of model after import

Change-Id: I8b70618c5c4d46f141f2dcec39fbf73ac0d730fc

6 years agoMerge "(refs #7453) Switch component type of the component"
Hannu Niemistö [Mon, 28 Aug 2017 07:51:06 +0000 (10:51 +0300)]
Merge "(refs #7453) Switch component type of the component"

6 years agoFixed null pointer problem from SCLSCriptEditorAdapter 94/894/1
Tuukka Lehtonen [Sun, 27 Aug 2017 18:11:21 +0000 (21:11 +0300)]
Fixed null pointer problem from SCLSCriptEditorAdapter

refs #7450

Change-Id: Iafa03f216815c5c0f06a8ed27a081cd7db1c71fc

6 years ago(refs #7453) Switch component type of the component 93/893/1
Hannu Niemistö [Sun, 27 Aug 2017 16:10:02 +0000 (19:10 +0300)]
(refs #7453) Switch component type of the component

This change adds ontology definitions for declaring a group of similar
component types and an action to switch between them.

Change-Id: I15f26d97e9eec81ff9ff1ec65e5f6be1782ba24b

6 years agoSupport for SCL script database storage, editing and execution 91/891/3
Tuukka Lehtonen [Fri, 25 Aug 2017 21:38:28 +0000 (00:38 +0300)]
Support for SCL script database storage, editing and execution

* Ontology for defining an SCL script in the database (L0.SCLScript)
* A text editor for L0.SCLScripts:
** Basic syntax highlighting (same as in SCL Module editor)
** Script validation
** Easy script execution directly from the editor (CTRL+R)
* View scripts in model browser under L0.Library instances
* Script execution from Model Browser context menu

refs #7450

Change-Id: I57016492589b6a9b693d926a56a3d0fe7b317023

6 years ago(refs #7452) Added PreferredDiagramEditorID to Modeling.graph 92/892/1
Hannu Niemistö [Sun, 27 Aug 2017 09:03:37 +0000 (12:03 +0300)]
(refs #7452) Added PreferredDiagramEditorID to Modeling.graph

Change-Id: I8e3ea28f814ecc7b28182bc47f5f4fde18fb7b3e

6 years agoAdding HK2 for Jersey injection 89/889/1
jsimomaa [Thu, 24 Aug 2017 13:52:32 +0000 (16:52 +0300)]
Adding HK2 for Jersey injection

Update target platform to include Aries for OSGI service loading

refs #7447

Change-Id: I702b2d2c34a596a849f2b535ff43d9cf58be4108

6 years agoAdding HK2 for Jersey injection 88/888/1
jsimomaa [Thu, 24 Aug 2017 13:47:05 +0000 (16:47 +0300)]
Adding HK2 for Jersey injection

Add Aries for OSGI service loading

refs #7447

Change-Id: I61ddbc83aefc9af2e3dbd722bd42a999715c95eb

6 years agoAdding HK2 for Jersey injection 87/887/1
jsimomaa [Thu, 24 Aug 2017 13:16:55 +0000 (16:16 +0300)]
Adding HK2 for Jersey injection

Update target platform

refs #7447

Change-Id: Ibf0bb2191457115e23128cf5a205779ed758ea34

6 years agoAdding HK2 for Jersey injection 86/886/1
jsimomaa [Thu, 24 Aug 2017 13:06:51 +0000 (16:06 +0300)]
Adding HK2 for Jersey injection

refs #7447

Change-Id: Icc9a3b059d51b88575e35266c20b2624600b7070

6 years agojava.nio.file.Files and Charset SCL API with <Exception> effect 83/883/4
jsimomaa [Wed, 23 Aug 2017 18:00:42 +0000 (21:00 +0300)]
java.nio.file.Files and Charset SCL API with <Exception> effect

refs #7448

Change-Id: I6c4a5307ae5a0ce6c346e1afe80f97b90464c3c6

6 years ago(refs #7448) Logging exceptions 85/885/2
Hannu Niemistö [Thu, 24 Aug 2017 09:23:17 +0000 (12:23 +0300)]
(refs #7448) Logging exceptions

Change-Id: I74cf2f40102adeb1c86abce3ecb4c9641d0fa7e5

6 years ago(refs #7448) Added Exception effect 84/884/2
Hannu Niemistö [Thu, 24 Aug 2017 08:59:27 +0000 (11:59 +0300)]
(refs #7448) Added Exception effect

Change-Id: I7a684e1d4b095924d03fd1fdbba2a7aa93794ada

6 years agoChange jersey from 2.25.1 to 2.26 to resolve resource-locator problems 81/881/1
jsimomaa [Wed, 23 Aug 2017 12:40:53 +0000 (15:40 +0300)]
Change jersey from 2.25.1 to 2.26 to resolve resource-locator problems

Update target platform definitions

refs #7447

Change-Id: I46dbb8626d37ae4ef0779e642bb5227395fe4482

6 years agoChange jersey from 2.25.1 to 2.26 to resolve resource-locator problems 79/879/1
jsimomaa [Wed, 23 Aug 2017 11:58:00 +0000 (14:58 +0300)]
Change jersey from 2.25.1 to 2.26 to resolve resource-locator problems

Update target platform definitions

refs #7447

Change-Id: I9b5d485a9640f944ed0cbd78644edb7b96308f86

6 years agoChange jersey from 2.25.1 to 2.26 to resolve resource-locator problems 78/878/1
jsimomaa [Wed, 23 Aug 2017 11:45:49 +0000 (14:45 +0300)]
Change jersey from 2.25.1 to 2.26 to resolve resource-locator problems

refs #7447

Change-Id: I9a63dc06c735fc1ac1f4902a7f21c2b721feba24

6 years agoFix osgi-resource-locator version from 2.5.0-b32 to 2.5.0 76/876/2
jsimomaa [Wed, 23 Aug 2017 10:23:49 +0000 (13:23 +0300)]
Fix osgi-resource-locator version from 2.5.0-b32 to 2.5.0

refs #7447

Change-Id: Icec708cb2fddc8cd4363d6a8d685b628763fcc6b

6 years agoMissing jersey-client to target & osgi-resource-locator version 2.5-0b32 75/875/3
jsimomaa [Wed, 23 Aug 2017 10:07:52 +0000 (13:07 +0300)]
Missing jersey-client to target & osgi-resource-locator version 2.5-0b32

refs #7447

Change-Id: I75e4412872fb429e51f5c9d81d64b0c1edb2f27a

6 years agoIgnore stray route lines when loading diagram connections 72/872/1
Tuukka Lehtonen [Mon, 21 Aug 2017 16:00:23 +0000 (19:00 +0300)]
Ignore stray route lines when loading diagram connections

Prevents diagram rendering from failing unexpectedly due to invalid
RouteGraph structure.

refs #7443

Change-Id: I7fb8949c01fd5ff24853fa3e3332a999df549d45

6 years agoOption to pass custom TG configuration to exportModel function 71/871/1
Jussi Koskela [Mon, 21 Aug 2017 08:11:37 +0000 (11:11 +0300)]
Option to pass custom TG configuration to exportModel function

Custom TG configuration is required for example if some resources need
to be excluded. Also fixed the exception handling not to wrap possible
DatabaseException in another DatabaseException.

refs #7442

Change-Id: Ibee0b501b2c7008d1f79b127859f0daa86719107

6 years agoAdd rounding to Simupedia connection lines 70/870/1
Jussi Koskela [Mon, 21 Aug 2017 07:32:22 +0000 (10:32 +0300)]
Add rounding to Simupedia connection lines

refs #7441

Change-Id: I758f65db94afe33dfd4f146dd49a7b8e00742e54

6 years ago(refs #7439) Added buffering to SCL Console output 68/868/1
Hannu Niemistö [Thu, 17 Aug 2017 14:49:41 +0000 (17:49 +0300)]
(refs #7439) Added buffering to SCL Console output

Change-Id: I757e5b9c7d0e03838ac8eee033e78b91949c7985

6 years ago(refs #7436) Added location information to ECHRRuleset 67/867/1
Hannu Niemistö [Thu, 17 Aug 2017 13:37:00 +0000 (16:37 +0300)]
(refs #7436) Added location information to ECHRRuleset

Also small modification to typechecking of ECHRRuleset to get smaller
scope for a potential type error.

Change-Id: I9edaaa26c5a18c988de3fa89f39290030394972c

6 years agoMerge "Support labels for property children"
Tuukka Lehtonen [Wed, 16 Aug 2017 12:11:47 +0000 (15:11 +0300)]
Merge "Support labels for property children"

6 years agoMerge "(refs #7433) Fixed a bug in Left.equals"
Hannu Niemistö [Wed, 16 Aug 2017 12:04:13 +0000 (15:04 +0300)]
Merge "(refs #7433) Fixed a bug in Left.equals"

6 years agoSupport labels for property children 63/863/1
Antti Villberg [Wed, 16 Aug 2017 11:55:49 +0000 (14:55 +0300)]
Support labels for property children

refs #7438

Change-Id: I14e45c9301ce46c72dfbc07c9bf2527181d3ea9c

6 years ago(refs #7433) Fixed a bug in Left.equals 62/862/1
Hannu Niemistö [Wed, 16 Aug 2017 11:39:01 +0000 (14:39 +0300)]
(refs #7433) Fixed a bug in Left.equals

Change-Id: I89e5f53dab6d0436b0bf73446709ac56d82231a9

6 years agoMerge changes Ife3918d5,I307f298d,Iec1e1077
Tuukka Lehtonen [Wed, 16 Aug 2017 10:45:10 +0000 (13:45 +0300)]
Merge changes Ife3918d5,I307f298d,Iec1e1077

* changes:
  Fixes to SVG generation
  renderSVG hardening
  ElementPainter produces infinite bounds for transformed selections

6 years agoFixes to SVG generation 58/858/1
Antti Villberg [Wed, 16 Aug 2017 10:22:10 +0000 (13:22 +0300)]
Fixes to SVG generation

refs #7421

Change-Id: Ife3918d5a06a3394494f61c6230ef33ca5fb7302

6 years agorenderSVG hardening 57/857/1
Antti Villberg [Wed, 16 Aug 2017 09:49:09 +0000 (12:49 +0300)]
renderSVG hardening

refs #7421

Change-Id: I307f298d8c7c6adfa2627634c3f4d0a6db3e2afb

6 years ago(refs #7436) Added location information for string interpolation 56/856/1
Hannu Niemistö [Wed, 16 Aug 2017 09:48:01 +0000 (12:48 +0300)]
(refs #7436) Added location information for string interpolation

Change-Id: I8f7ef2b89ca8359c4de1944a36ae4b9688bfca18

6 years agoElementPainter produces infinite bounds for transformed selections 55/855/1
Antti Villberg [Wed, 16 Aug 2017 09:47:37 +0000 (12:47 +0300)]
ElementPainter produces infinite bounds for transformed selections

refs #7435

Change-Id: Iec1e107799b9f4137cf045b56dd8dd2f250aea3e

6 years ago(refs #7434) Added DefaultMouseListener to all modelled graph explorers. 53/853/1
Hannu Niemistö [Wed, 16 Aug 2017 08:15:36 +0000 (11:15 +0300)]
(refs #7434) Added DefaultMouseListener to all modelled graph explorers.

Change-Id: Id5661baa6d3102e99b2457f54e0233b4f9738a41

6 years ago(refs #7433) Make Either type available in Java 52/852/2
Hannu Niemistö [Wed, 16 Aug 2017 06:06:31 +0000 (09:06 +0300)]
(refs #7433) Make Either type available in Java

Change-Id: I9ee7e4ca0bb2bf682b00447d8a44568276e74083

6 years agoWrong context variable to domainChildren query in StandardGraphProper.. 47/847/2
Antti Villberg [Tue, 15 Aug 2017 03:45:51 +0000 (06:45 +0300)]
Wrong context variable to domainChildren query in StandardGraphProper..

refs #7431

Change-Id: Iabbfd8a45ad05918b5c678c20a07d1deea7b3fb0

6 years ago(refs #7430) Minor fix to Serialization module 46/846/2
Hannu Niemistö [Mon, 14 Aug 2017 15:16:48 +0000 (18:16 +0300)]
(refs #7430) Minor fix to Serialization module

Change-Id: Ie3badcc043a1ea8420b8ef9ee25b18788d2661b4

6 years agoChange jsoup version to 1.8.3 45/845/2
jsimomaa [Mon, 14 Aug 2017 14:30:39 +0000 (17:30 +0300)]
Change jsoup version to 1.8.3

refs #7429

Change-Id: Ida1c1a0846771141b41191e7d36ee8b1bc43bc90

6 years agoUpdate jsoup version to 1.8.3 44/844/2
jsimomaa [Mon, 14 Aug 2017 14:24:23 +0000 (17:24 +0300)]
Update jsoup version to 1.8.3

refs #7429

Change-Id: Ia7278c59695bbfa22b2659e2543ab7db0e2b3120

6 years agoMerge "(refs #7428) Added predicatesOf function to Simantics/DB"
Tuukka Lehtonen [Mon, 14 Aug 2017 12:41:22 +0000 (15:41 +0300)]
Merge "(refs #7428) Added predicatesOf function to Simantics/DB"

6 years agoMerge "Removed unnecessary oxygen-specific feature"
Tuukka Lehtonen [Mon, 14 Aug 2017 12:39:42 +0000 (15:39 +0300)]
Merge "Removed unnecessary oxygen-specific feature"

6 years agoRemoved unnecessary oxygen-specific feature 40/840/2
Miro Richard Eklund [Mon, 14 Aug 2017 12:06:40 +0000 (15:06 +0300)]
Removed unnecessary oxygen-specific feature

org.simantics.desktop.product.oxygen.feature is no longer needed, as
every plugin it includes is already included by other features in the
base "org.simantics.desktop.product.feature".

Amend: Updated pom.xml

(refs #7358)

Change-Id: I25ebe7153cd5ca683908311d04b38eb73a5b6c02

6 years ago(refs #7428) Added predicatesOf function to Simantics/DB 38/838/2
Hannu Niemistö [Mon, 14 Aug 2017 11:46:28 +0000 (14:46 +0300)]
(refs #7428) Added predicatesOf function to Simantics/DB

Change-Id: I77e4962373d9fbea81fab37fd5b59ee434133eb3

6 years ago(refs #7427) Correct error markings for import errors in SCL editor 37/837/1
Hannu Niemistö [Mon, 14 Aug 2017 07:48:48 +0000 (10:48 +0300)]
(refs #7427) Correct error markings for import errors in SCL editor

Change-Id: I6562648117392aaa670964a629a4154a3707d2a6

6 years agoFix target platform for SCL REST API 35/835/1
jsimomaa [Mon, 14 Aug 2017 06:04:08 +0000 (09:04 +0300)]
Fix target platform for SCL REST API

Include javax.servlet and required Jersey dependencies to target
platform

refs #7374

Change-Id: I4f63583ad0ffa168586106dd5592bf8c67f7e633

6 years agoFix target platform for SCL REST API 34/834/1
jsimomaa [Mon, 14 Aug 2017 05:54:55 +0000 (08:54 +0300)]
Fix target platform for SCL REST API

Include javax.servlet and required Jersey dependencies to target
platform

refs #7374

Change-Id: I9291db6bb01f12fa45d733457df9f05d489dffee

6 years agoSCLProgressMonitor implements IProgressMonitor 33/833/1
jsimomaa [Mon, 14 Aug 2017 03:55:32 +0000 (06:55 +0300)]
SCLProgressMonitor implements IProgressMonitor

refs #7426

Change-Id: I17975178e3627db2ba623edc22cf938e4df9c9b8

6 years agoAdd org.eclipse.userstorage to desktop feature 30/830/2
Antti Villberg [Fri, 11 Aug 2017 14:44:25 +0000 (17:44 +0300)]
Add org.eclipse.userstorage to desktop feature

refs #7423

Change-Id: I172e0f49bde77e62e5bdbff0c6989d2eba67f7e8

6 years agoAmendment to commit 373affcc 29/829/1
Tuukka Lehtonen [Thu, 10 Aug 2017 15:56:33 +0000 (18:56 +0300)]
Amendment to commit 373affcc

Also remove <this> parameter from org.simantics.diagram/adapters.xml now
that the constructor is gone.

refs #7416

Change-Id: I615d911268124dd3f8a61e7b76c9146c5894bcfe

6 years agoAdded missing org.eclipse.ui.intro.quicklinks to os.ui.workbench feature 28/828/1
Tuukka Lehtonen [Thu, 10 Aug 2017 15:54:16 +0000 (18:54 +0300)]
Added missing org.eclipse.ui.intro.quicklinks to os.ui.workbench feature

This is now required thanks to Eclipse 4.7 Oxygen.

refs #7358

Change-Id: Iffc73274004a596da5a76b613745dcd99d8a13bb

6 years agoModelImportWizard.doImport does not import the model to specified target 21/821/2
Jussi Koskela [Wed, 9 Aug 2017 10:00:35 +0000 (13:00 +0300)]
ModelImportWizard.doImport does not import the model to specified target

When triggered from the UI the target should always be the project
resource. Otherwise any target resource should be accepted.
DefaultPasteImportAdvisor must be used instead of the
ModelImportAdvisor, since ModelImportAdvisor always replaces the target
with the project resource (to support copy-pasting of models in UI).

refs #7418

Change-Id: I1b7eaef30ab32154319822c0615b9ab96a3f70b6

6 years agoExport org.simantics.modeling.ui.sharedontology.wizard package 20/820/2
Jussi Koskela [Wed, 9 Aug 2017 09:59:28 +0000 (12:59 +0300)]
Export org.simantics.modeling.ui.sharedontology.wizard package

Allow external access to wizards.

refs #7419

Change-Id: I9669a8eea7495003816c0d001a4b0e75e871ac88

6 years agoDiagram to SVG to support selection cycling 26/826/2
Antti Villberg [Thu, 10 Aug 2017 07:44:27 +0000 (10:44 +0300)]
Diagram to SVG to support selection cycling

refs #7421

Change-Id: I0d9a0d54b38595d946e8f599136a59a3eff8e429

6 years agoMore type information for diagram elements 25/825/2
Antti Villberg [Thu, 10 Aug 2017 07:32:41 +0000 (10:32 +0300)]
More type information for diagram elements

refs #7420

Change-Id: Iab051ea3f367f6d421e2ae88d2290af35314a454

6 years agoRemoved useless constructor from class GraphLayerUtil 16/816/2
Tuukka Lehtonen [Tue, 8 Aug 2017 14:19:11 +0000 (17:19 +0300)]
Removed useless constructor from class GraphLayerUtil

refs #7416

Change-Id: I081e20d3bc6fc9ceb32af8b04dd9d48db894ca8a

6 years agoBumped Simantics Desktop product version to 1.31.0 27/827/1
Tuukka Lehtonen [Thu, 10 Aug 2017 12:49:21 +0000 (15:49 +0300)]
Bumped Simantics Desktop product version to 1.31.0

refs #7396

Change-Id: I32855cfb2329d9d5fc65543dccb84ec74a42a1ba

6 years agoWorking to get full platform to build working on linux
Tuukka Lehtonen [Thu, 10 Aug 2017 12:34:46 +0000 (15:34 +0300)]
Working to get full platform to build working on linux

Moved org.simantics.editors.win32 plugin and the feature newly created
to include it (org.simantics.editors.win32.feature) under the maven
<profile> called win32. So org.simantics.editors.win32 is no longer
included in org.simantics.ui.workbench feature and to build it,
-P win32 needs to be specified to maven.

refs #7358

6 years agoFixed mvn package and verify to also work with linux (+mac?)
Tuukka Lehtonen [Thu, 10 Aug 2017 10:35:14 +0000 (13:35 +0300)]
Fixed mvn package and verify to also work with linux (+mac?)

Added settings.xml file to root that contains credentials for Maven
to download the Simantics maven graph-compiler plugin.

refs #7358

6 years agoFix org.simantics.sdk.source.features to 1.31.0 24/824/1
Miro Richard Eklund [Wed, 9 Aug 2017 14:27:55 +0000 (17:27 +0300)]
Fix org.simantics.sdk.source.features to 1.31.0

During merge they stayed as 1.30.0 but should be 1.31.0.

Change-Id: Ibafb57322fe8ad813823cfd0b0808280ca41c732

6 years agoUpdate locations to use mirror-locations 22/822/4
Miro Richard Eklund [Wed, 9 Aug 2017 13:14:13 +0000 (16:14 +0300)]
Update locations to use mirror-locations

Mirror-locations are now used rather than eclipse's download site.

Before merge to master, update the locations to use /master/ rather than
/private/eclipse-4.7/.

Amend: Updated private/eclipse-4.7 to master

refs #7358

Change-Id: I62c8eb2f06cf79a5759d21da3a51a0db1dca3c16

6 years agoMerge branch 'master' into private/eclipse-4.7 19/819/5
Miro Richard Eklund [Wed, 9 Aug 2017 06:53:38 +0000 (09:53 +0300)]
Merge branch 'master' into private/eclipse-4.7

Resolved Conflicts:
releng/org.simantics.sdk.build.targetdefinition/simantics.target

refs #7358

Change-Id: Idefea4e4c60de59664904bdd0a2a0a517af8db4c

6 years agoOptimized EntityInstances and ModelingUtils.search*Shallow queries 15/815/1
Tuukka Lehtonen [Mon, 7 Aug 2017 15:05:35 +0000 (18:05 +0300)]
Optimized EntityInstances and ModelingUtils.search*Shallow queries

Shallow queries were previously doing tons of useless queries into
dependent ontologies which would have been filtered out anyway. Also
EntityInstances.QueryIndex.perform now optimizes two corner cases:
* only one search result which is usual for GUID searches
* removal of Types:*Entity filter term which is useless because all
  instances are entities.

refs #7415

Change-Id: I89b9495ea51ca8fba4bd40db113c91f4a12932d0

6 years agoMerge "Improvements to resolving primitive properties in document server"
Tuukka Lehtonen [Mon, 7 Aug 2017 09:38:19 +0000 (12:38 +0300)]
Merge "Improvements to resolving primitive properties in document server"

6 years ago(refs #7414) Added Dynamic constructor 14/814/1
Hannu Niemistö [Mon, 7 Aug 2017 08:08:39 +0000 (11:08 +0300)]
(refs #7414) Added Dynamic constructor

Change-Id: I64bd802966ac2f44b88b1b6d87518a730a0a6203

6 years agoMerge "Redirect document commandRelation and commandExecutorRelation terminals"
Tuukka Lehtonen [Mon, 7 Aug 2017 05:24:00 +0000 (08:24 +0300)]
Merge "Redirect document commandRelation and commandExecutorRelation terminals"

6 years agoImprovements to resolving primitive properties in document server 98/798/3
Jussi Koskela [Wed, 2 Aug 2017 11:38:23 +0000 (14:38 +0300)]
Improvements to resolving primitive properties in document server

Catch and report property value evaluation exceptions, fixed typo in
dataDefinitions reading, always initialize property map, improved error
message formatting.

refs #7405
Change-Id: I4ba78bb0b91b05e1f04a65f4dc92fcfe06620f60

6 years agoFixed RVI.fromResourceFormat GUID RVI part parsing
Tuukka Lehtonen [Sat, 5 Aug 2017 08:56:17 +0000 (11:56 +0300)]
Fixed RVI.fromResourceFormat GUID RVI part parsing

The code was skipping over the first character of GUID RVI parts
producing invalid RVIs. This again resulted in the creation of invalid
subscriptions etc.

refs #7413

Change-Id: I755b79ca352355789846b2ff49858b757fea9c63
(cherry picked from commit 1051b77973cc1ff7363798f1fed018ddc356dc1d)

6 years agoMerge "Added Simantics/Diagram#diagramsUnder to complement diagramsOf"
Tuukka Lehtonen [Sat, 5 Aug 2017 00:46:46 +0000 (03:46 +0300)]
Merge "Added Simantics/Diagram#diagramsUnder to complement diagramsOf"

6 years agoAdded Simantics/Diagram#diagramsUnder to complement diagramsOf 09/809/1
Tuukka Lehtonen [Fri, 4 Aug 2017 21:31:43 +0000 (00:31 +0300)]
Added Simantics/Diagram#diagramsUnder to complement diagramsOf

refs #7410

Change-Id: Iab18ab1bf44e96decbc14de2a5289b51feca387f
(cherry picked from commit 159f9e3b618521c76a9dc6c8ffd94a7a3c35b82a)

6 years agoFixed CommandContextImpl.merge to not duplicate same values in result 07/807/1
Tuukka Lehtonen [Fri, 4 Aug 2017 20:52:31 +0000 (23:52 +0300)]
Fixed CommandContextImpl.merge to not duplicate same values in result

According to Antti this was a known and very old problem that should now
finally be resolved.

refs #7409

Change-Id: I0ab43d7136fca3f3333a81751fc86e0da7085a26
(cherry picked from commit c09116b855b4bb4a377be1c573ddbb5d755c0bc1)

6 years agoRedirect document commandRelation and commandExecutorRelation terminals 06/806/1
Tuukka Lehtonen [Fri, 4 Aug 2017 21:51:16 +0000 (00:51 +0300)]
Redirect document commandRelation and commandExecutorRelation terminals

Previously they were modelled as inputs, now they are outputs like they
IMHO should be.

refs #7411

Change-Id: I42529a9969adf49ef314118fae16067821638c5e