simantics/platform.git
4 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"

4 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"

4 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"

4 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

4 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

4 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

4 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)

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

4 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)

4 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)

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

4 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."

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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)

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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"

4 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

4 years agoProcess disableIndex and databaseId arguments in SCLScriptRunner 80/480/2
Marko Luukkainen [Thu, 4 May 2017 08:11:45 +0000 (11:11 +0300)]
Process disableIndex and databaseId arguments in SCLScriptRunner
application

fixes #7183

Change-Id: Ia83059a2c2331f770245635685b1b4e77887c904

4 years agoMerge changes I7c81eac8,I15581be9
Tuukka Lehtonen [Wed, 3 May 2017 18:15:58 +0000 (21:15 +0300)]
Merge changes I7c81eac8,I15581be9

* changes:
  Fixed URI problems related to EnternalEntities during import
  Removed IRequest references and usage from Document/All

4 years agoFixed URI problems related to EnternalEntities during import 79/479/1
Miro Richard Eklund [Wed, 3 May 2017 14:39:29 +0000 (17:39 +0300)]
Fixed URI problems related to EnternalEntities during import

Introduced a new function, getTrueUri, that gives the escaped URI.
Used when finding external entities.
Previously, getUri was used, which made finding external entities
impossible, for all User Component's with a space in their name.

refs #7182

Change-Id: I7c81eac8843f98f19054ad5df0b4ee73d2a1753e

4 years agoAdded Simantics/PGraph SCL API for compiling shared ontologies TGs 67/467/3
jsimomaa [Fri, 28 Apr 2017 10:05:56 +0000 (13:05 +0300)]
Added Simantics/PGraph SCL API for compiling shared ontologies TGs

Moved CompilePGraph action implementation to org.simantics.modeling and
made the code headless. UI problem reporting can be done using the
provided CompilePGraphs.UserAgent interface.

refs #7181

Change-Id: I0c9e7fe5e4916077268651a6dea6c869f08a7d72

4 years agoRemoved IRequest references and usage from Document/All 77/477/2
Miro Richard Eklund [Wed, 3 May 2017 08:30:28 +0000 (11:30 +0300)]
Removed IRequest references and usage from Document/All

An recent change (Revision 82ed7c74) to Document/All.scl  added IRequest
usage and references. IRequest should not be used in Documents/All.
82ed7c74 broke SimupediaServer's Request.scl, since
Request.scl uses Document/All and also already had IRequest defined.

refs #7173

Change-Id: I15581be91cc98756025afdd6acbf72318de84228

4 years ago(refs #7180) Configurable font for FlagNode 78/478/1
Hannu Niemistö [Wed, 3 May 2017 13:38:56 +0000 (16:38 +0300)]
(refs #7180) Configurable font for FlagNode

Change-Id: I01e041e83ed8d66ad203107c2b4ff1d670756e5f

4 years agoAdded file-extension filter function to Core.scl for Dropins. 72/472/4
Miro Richard Eklund [Tue, 2 May 2017 15:01:41 +0000 (18:01 +0300)]
Added file-extension filter function to Core.scl for Dropins.

Generic file-importer can be asked which extensions are supported. Added
that function to Core.scl.

refs #7154

Change-Id: If9d76c61e19ea543eda9ee23524d18c5d4623ee3

4 years agoFix compilation problems from org.simantics.gnuplot/pom.xml 76/476/1
Tuukka Lehtonen [Tue, 2 May 2017 20:27:23 +0000 (23:27 +0300)]
Fix compilation problems from org.simantics.gnuplot/pom.xml

The problem surfaced after putting the maven graph compiler plugin into
use.

refs #7178

Change-Id: Icb660bc39711951c545a50baed945d0d6c3a7996

4 years agoAdded graph compilation goal to Maven build. 75/475/3
Hannu Niemistö [Sun, 30 Apr 2017 05:24:55 +0000 (08:24 +0300)]
Added graph compilation goal to Maven build.

Removed graph.tgs and resource files.

Added reference to graph builder repository

Change-Id: Ic7d17214827259fcb02fa881653961d0e8885744

4 years ago(refs #7177) Rounded connections 74/474/3
Hannu Niemistö [Tue, 2 May 2017 17:04:35 +0000 (20:04 +0300)]
(refs #7177) Rounded connections

Adds HasRounding property to G2D that rounds connections in the
diagrams.

Change-Id: I2f5429f90e926b9569633056d50a233cf9f4c395

4 years agoSome fixes for resource cleaning spreadsheets in simupedia 68/468/2
jsimomaa [Fri, 28 Apr 2017 10:07:23 +0000 (13:07 +0300)]
Some fixes for resource cleaning spreadsheets in simupedia

refs #7173

Change-Id: I2b8cf12a0abae25f34e691c5251a34fa0e2ab1f9

4 years agoMerge "(refs #6924) Support for record field access syntax."
Hannu Niemistö [Thu, 27 Apr 2017 20:55:55 +0000 (23:55 +0300)]
Merge "(refs #6924) Support for record field access syntax."

4 years agoAdded maxQueueLength parameter constructor for DisposingPolicy. 65/465/1
Tuukka Lehtonen [Thu, 27 Apr 2017 12:56:07 +0000 (15:56 +0300)]
Added maxQueueLength parameter constructor for DisposingPolicy.

Previously DisposingPolicy was hardcoded to 8 item queues.

refs #7172

Change-Id: I2b7df0b71483396490ab559271f7531ae80d0822

4 years agoImproved Acorn database rollback logic. 61/461/4
Tuukka Lehtonen [Tue, 25 Apr 2017 10:13:45 +0000 (13:13 +0300)]
Improved Acorn database rollback logic.

MainState will no longer destroy the entire database if the user removes
directories but forgets to remove the main.state file. The information
stored in main.state is now regarded as cached information only and if
it seems invalid or cannot be read, the same normal rollback logic will
be performed every time.

Another enhancement is that rollback will now automatically store the
revisions deleted by the rollback procedure in timestamped
<workspace>/db/recovery/yyyy-M-d_HH-mm-ss/ folders for later inspection
and debugging. Previously the code just deleted all the extra revisions.
Manually removing the recovery-folder is always a safe operation to
perform.

Also fixed a bug in databoard Files class readFile methods that take
a File as argument. Previously all the functions constructed a
BinaryFile using the default mode which is "rw". This unintentionally
made the readFile methods create an empty file if the file did not
exist. All such methods have been changed to use mode "r".

refs #7124

Change-Id: I3ac04d2e33151b33f4982cf7a2edce7ddb896e11

4 years ago(refs #6924) Support for record field access syntax. 64/464/2
Hannu Niemistö [Mon, 24 Apr 2017 15:24:17 +0000 (18:24 +0300)]
(refs #6924) Support for record field access syntax.

Because the record field access syntax is harder to implement when the
old Variable access syntax is also supported, this feature is only
enabled (and Variable disabled), when the following module header is
used:

module {
    fields
}

This change contains also refactoring and cleaning up of code
related to variable resolving and field handling.

Change-Id: I8e877573131d501e1a6e63bdde39e064df9ded39

4 years ago(refs #7168) User Thread.stop to terminate execution in SCL console 59/459/1
Hannu Niemistö [Mon, 24 Apr 2017 11:16:55 +0000 (14:16 +0300)]
(refs #7168) User Thread.stop to terminate execution in SCL console

Change-Id: I07b5bc2fd64953c8d67d19582cadcc348addb6e3

4 years ago(refs #7105) Added defaultLocalName property to SCL modules 58/458/4
Hannu Niemistö [Mon, 24 Apr 2017 05:58:38 +0000 (08:58 +0300)]
(refs #7105) Added defaultLocalName property to SCL modules

In textual modules defaultLocalName can be set in the module header. For
ontology modules, use Ontology.defaultLocalName property.

Change-Id: I2966c0b16e5d5f07c0e591a094f63908a7b492b3

4 years agoMerge "Removed jsonValues since there already is Data/Json"
Hannu Niemistö [Mon, 24 Apr 2017 07:24:47 +0000 (10:24 +0300)]
Merge "Removed jsonValues since there already is Data/Json"

4 years agoExport also dynamic issues to issue CSV export file 57/457/1
Tuukka Lehtonen [Sun, 23 Apr 2017 13:20:27 +0000 (16:20 +0300)]
Export also dynamic issues to issue CSV export file

refs #7167

Change-Id: I8070697535fb0f0db64c87bc86cb0d521edb9e10
(cherry picked from commit 8217d73384dd10e8558e0a24c7202d5182012275)

4 years agoRemoved jsonValues since there already is Data/Json 50/450/8
Tuukka Lehtonen [Thu, 20 Apr 2017 10:54:20 +0000 (13:54 +0300)]
Removed jsonValues since there already is Data/Json

A more generic possibleFromDynamic.

Alternative method modelling.

Combined multiple Antti's commits

Get rid of uses of gnu.trove2

refs #7156

instantiateUnder function property for types

refs #7157

SCLDropAction

refs #7158

Empty RVI literal in L0

refs #7159

possibleFromDynamic coersion function in Simantics/DB

refs #7160

jsonValues parsing function into Simantics/DB

refs #7161

Generic instantiation action based on instantiateUnder

refs #7162

ModelBrowser.handleDrop action should be run in SWT thread

refs #7163

RVI support in Simantics/Variables

refs #7164

Variables change

Change-Id: If21b623c27b660a9b6bc150c905f0360b15d08a0

4 years agoAllow tab-separated columnized logging of memory use 54/454/1
Tuukka Lehtonen [Sun, 23 Apr 2017 10:23:43 +0000 (13:23 +0300)]
Allow tab-separated columnized logging of memory use

refs #7166

Change-Id: I6a7f38757db1c3cfcd0d04cfedfd963fde4c5a4d

4 years agoSome fileimport enhancements - Add support for Excel import 34/434/9
jsimomaa [Thu, 20 Apr 2017 07:40:09 +0000 (10:40 +0300)]
Some fileimport enhancements - Add support for Excel import

Removed e.printStackTrace() method calls

refs #7154

Change-Id: Ic70c24330683b3477b928daf966fd44fa30ac363

4 years agoRudimentary Linux and MacOSX support for org.simantics.nativemem 52/452/3
Tuukka Lehtonen [Fri, 21 Apr 2017 10:22:58 +0000 (13:22 +0300)]
Rudimentary Linux and MacOSX support for org.simantics.nativemem

Linux now supports current and peak RSS and OSX only supports peak RSS
information.

Moved org.simantics.nativemem + JNA into a separate feature
org.simantics.nativemem.feature from org.simantics.utils.feature to not
force the dependency onto all products.

refs #7166

Change-Id: Id114659065097ecd45f8b40ff9d07e2df0b33db2

4 years agoGet rid of uses of gnu.trove2 40/440/4
jsimomaa [Thu, 20 Apr 2017 12:10:26 +0000 (15:10 +0300)]
Get rid of uses of gnu.trove2

refs #7156

Change-Id: Iea74017d93d7d5a1a7254d4b540369e52fbab879

4 years agoFixed TrendNode.setTrendSpec to properly update item axes 38/438/1
Tuukka Lehtonen [Thu, 20 Apr 2017 10:54:20 +0000 (13:54 +0300)]
Fixed TrendNode.setTrendSpec to properly update item axes

The previous code was not counting the set axes hidden/unhidden between
successive TrendNode.setTrendSpec calls.

refs #7155

Change-Id: I7aa9d8dec76d4328d2f4d12dfd0f9523fea71f2c

4 years agoFixed priority comparison direction change caused by commit 4495707b 35/435/1
Tuukka Lehtonen [Thu, 20 Apr 2017 08:20:31 +0000 (11:20 +0300)]
Fixed priority comparison direction change caused by commit 4495707b

refs #7147

Change-Id: I6bc9c7b165f80a76b58bdc4f7f4d754e705e962e

4 years agoLess memory use for TG import when NamespaceMigrationStep is involved 33/433/1
Tuukka Lehtonen [Wed, 19 Apr 2017 20:08:10 +0000 (23:08 +0300)]
Less memory use for TG import when NamespaceMigrationStep is involved

MigrationStateImpl.getProperty for root resource(s) keys now first
exports CURRENT_TG back to disk if the TG has already been loaded and
then imports it back using StreamingTransferableGraphImportProcess. This
avoids the need to keep the whole TransferableGraph1 in memory while
doing the import and also allows for the use of the leaner Streaming
import process.

refs #7153

Change-Id: I2ef6ae055cd8a497263c3aa3e95c86ff29a96f3e

4 years agoMerge "Fixed regression caused by commit e6c0bd94."
Tuukka Lehtonen [Wed, 19 Apr 2017 13:53:21 +0000 (16:53 +0300)]
Merge "Fixed regression caused by commit e6c0bd94."

4 years agoFixed regression caused by commit e6c0bd94. 29/429/1
Tuukka Lehtonen [Wed, 19 Apr 2017 13:36:32 +0000 (16:36 +0300)]
Fixed regression caused by commit e6c0bd94.

refs #7142

Change-Id: I8d15afab87f00b84ea3ecae22d1666c614418371

4 years ago(refs #7152) Remove extra line number indicators in status bar 28/428/1
Hannu Niemistö [Wed, 19 Apr 2017 13:08:54 +0000 (16:08 +0300)]
(refs #7152) Remove extra line number indicators in status bar

Change-Id: Ib8f7b09260f3e64bb123fcbe26ade29937e1b429

4 years agoFixed NPE bug caused by UpdateIssuesForOpenDiagrams issue view handler 25/425/1
Tuukka Lehtonen [Wed, 19 Apr 2017 08:04:06 +0000 (11:04 +0300)]
Fixed NPE bug caused by UpdateIssuesForOpenDiagrams issue view handler

refs #7149

Change-Id: I61be5de3a09d821fb6a27b299e082d00d84e77d5

4 years agoAutomatic table column resizing for SCL console manage imports dialog. 24/424/1
Tuukka Lehtonen [Wed, 19 Apr 2017 08:02:46 +0000 (11:02 +0300)]
table column resizing for SCL console manage imports dialog.

refs #7150

Change-Id: Ie951241aaccbaa266eaaa42369ced699dd56aafb

4 years agoSymbol code style into platform 20/420/4
Antti Villberg [Tue, 18 Apr 2017 13:10:21 +0000 (16:10 +0300)]
Symbol code style into platform

refs #7146

Change-Id: Ic417ecdf8ff59c2f89747d82932dfd404c3293c4

4 years agoGeneric Model Import 23/423/3
Antti Villberg [Tue, 18 Apr 2017 13:15:06 +0000 (16:15 +0300)]
Generic Model Import

refs #7144

Change-Id: I3bcf568b70e12b3493563901c7de228b9be35cd4

4 years agoContributed profile entries 22/422/2
Antti Villberg [Tue, 18 Apr 2017 13:14:34 +0000 (16:14 +0300)]
Contributed profile entries

refs #7148

Change-Id: I9fe9a7f6a3d6eb2d2bf3122d7960e220895cba63

4 years agoBroken tab contribution sorting causes missing contributions 21/421/4
Antti Villberg [Tue, 18 Apr 2017 13:12:22 +0000 (16:12 +0300)]
Broken tab contribution sorting causes missing contributions

refs #7147

Change-Id: I82719519e4a1bcad541e1ce45db2ff16099cd17a

4 years agoMerge "Model export broke down due to internal resource changes"
Hannu Niemistö [Tue, 18 Apr 2017 14:03:01 +0000 (17:03 +0300)]
Merge "Model export broke down due to internal resource changes"

4 years agoModel export broke down due to internal resource changes 19/419/1
Antti Villberg [Tue, 18 Apr 2017 13:07:53 +0000 (16:07 +0300)]
Model export broke down due to internal resource changes

refs #7145

Change-Id: I799a57b37763b9def8313989a38afa5560389077

4 years agoAdded alternatives taking RequestProcessor to WorkbenchSelectionUtils. 15/415/4
Tuukka Lehtonen [Tue, 18 Apr 2017 08:56:01 +0000 (11:56 +0300)]
Added alternatives taking RequestProcessor to WorkbenchSelectionUtils.

Fixed several places which were found to use a method from
WorkbenchSelectionUtils that could potentially try to initiate a new
read transaction through org.simantics.db.Session to pass the current
ReadGraph over to WorkbenchSelectionUtils instead. This fixes the very
same problem from OpenWithMenuContribution that was introduced in
6d3ad788 change I45cfa3940df8e1f4abe016b215843dc083227b2b.

Also, ComponentTypeViewerData.editValue now prevents committing new
entered value if the value does not pass input validation.

refs #7077
refs #7142

Change-Id: I542bd24e24ebc46c7da790c847ffafc5b8d18053

4 years ago(refs #7141) Converted an error to a warning 14/414/1
Hannu Niemistö [Mon, 17 Apr 2017 05:27:50 +0000 (08:27 +0300)]
(refs #7141) Converted an error to a warning

Change-Id: I8b29ed7d532a8c7ec09622a3e0fa55f925737bdc

4 years agoFixed diagram NPE regressions caused by commit 5d2af6df 12/412/1
Tuukka Lehtonen [Thu, 13 Apr 2017 16:13:06 +0000 (19:13 +0300)]
Fixed diagram NPE regressions caused by commit 5d2af6df

The code was not taking into account that IG2DNode.getBoundsInLocal can
return null.

refs #7109

Change-Id: I9f41b9f2119ba8d273daf97b1b1e90a03d91fd22

4 years agoMerge "Declare effects for constants and variables"
Tuukka Lehtonen [Thu, 13 Apr 2017 11:27:56 +0000 (14:27 +0300)]
Merge "Declare effects for constants and variables"

4 years agoDeclare effects for constants and variables 10/410/2
Hannu Niemistö [Thu, 13 Apr 2017 10:08:54 +0000 (13:08 +0300)]
Declare effects for constants and variables

Effectful constants and variables now correctly declare their effects.

refs #7140
[PRIVATE-13312]

Change-Id: Ie40c3985ac61acb707293161b8aefb361d691732

4 years agoMerge "Accept existential variables as record shorthand fields"
Hannu Niemistö [Tue, 11 Apr 2017 09:30:14 +0000 (12:30 +0300)]
Merge "Accept existential variables as record shorthand fields"

4 years agoAccept existential variables as record shorthand fields 09/409/1
Hannu Niemistö [Mon, 10 Apr 2017 21:27:16 +0000 (00:27 +0300)]
Accept existential variables as record shorthand fields

Change-Id: I2d4ca35f26ba80795696b357f81d778420f40d51

4 years agoFixed old DB tests to compile after merging commit:d33a5a61. 08/408/1
Tuukka Lehtonen [Mon, 10 Apr 2017 15:03:02 +0000 (18:03 +0300)]
Fixed old DB tests to compile after merging commit:d33a5a61.

refs #6998

Change-Id: I0dc864d925bc1a2b27b32d4211dfd788e3ec41fe

4 years agoMerge branch 'feature/funcwrite'
Tuukka Lehtonen [Fri, 7 Apr 2017 07:38:57 +0000 (10:38 +0300)]
Merge branch 'feature/funcwrite'

4 years agoMap some ListUtils functions to SCL (refs #7134). 07/407/2
tmtuomas [Thu, 6 Apr 2017 07:16:11 +0000 (10:16 +0300)]
Map some ListUtils functions to SCL (refs #7134).

Change-Id: I7307c34dd068af6f3be1032d6e5841d5b3b1c346

4 years agoMerge "Enabling ResourceFile CR filtering based on locale"
Tuukka Lehtonen [Wed, 5 Apr 2017 14:50:47 +0000 (17:50 +0300)]
Merge "Enabling ResourceFile CR filtering based on locale"

4 years agoMerge "Update all graph.tg files that seem to be out-of-date in git"
Tuukka Lehtonen [Wed, 5 Apr 2017 14:20:03 +0000 (17:20 +0300)]
Merge "Update all graph.tg files that seem to be out-of-date in git"

4 years agoEnabling ResourceFile CR filtering based on locale 06/406/1
Hannu Niemistö [Wed, 5 Apr 2017 13:40:35 +0000 (16:40 +0300)]
Enabling ResourceFile CR filtering based on locale

Change-Id: Ia16ff6a5fd090aca4f679a1d5aa1e5ae2590b37d

4 years agoUpdate all graph.tg files that seem to be out-of-date in git 04/404/1
Tuukka Lehtonen [Wed, 5 Apr 2017 13:25:40 +0000 (16:25 +0300)]
Update all graph.tg files that seem to be out-of-date in git

refs #7132

Change-Id: Id6513256d7987c322dd35833f7b8fc87607d6e5e

4 years agoAllow SWTThread to be constructed to do execute(Runnable) asynchronously 03/403/1
Tuukka Lehtonen [Wed, 5 Apr 2017 13:18:23 +0000 (16:18 +0300)]
Allow SWTThread to be constructed to do execute(Runnable) asynchronously

refs #7131

Change-Id: I0fa2072895253cf0fcf80f3de48efe536004c6b8

4 years agoDynamic positioning of terminals in G2D 91/391/2
Antti Villberg [Mon, 3 Apr 2017 07:21:16 +0000 (10:21 +0300)]
Dynamic positioning of terminals in G2D

refs #7119

Change-Id: Ib0585c71c94ddca77ce41311cdce4916d033afba

4 years agoGuard against NPE in ConnectionRelationLabelDecorationRule 93/393/3
Antti Villberg [Mon, 3 Apr 2017 07:24:40 +0000 (10:24 +0300)]
Guard against NPE in ConnectionRelationLabelDecorationRule

refs #7121

Change-Id: I3067fa3f80823690301239adba24f3548721a500

4 years agoSupport SVG generation from scenegraph 94/394/4
Antti Villberg [Mon, 3 Apr 2017 07:25:30 +0000 (10:25 +0300)]
Support SVG generation from scenegraph

refs #7054

Change-Id: Ide69219fee786bd19ccf447c227c2424d9cabdc2

4 years agoDatabase backwards compatibility fix for fail-safe import changes 98/398/1
Tuukka Lehtonen [Mon, 3 Apr 2017 12:10:34 +0000 (15:10 +0300)]
Database backwards compatibility fix for fail-safe import changes

To keep databases created before Mar 30 18:39 compatible with the
current git master version.

refs #7016

Change-Id: Ic327809eae90d01d115cfb880a33b9dc37051a36

4 years agoAllow overriding of CopyPasteHandler and Paster methods 95/395/5
Marko Luukkainen [Mon, 3 Apr 2017 09:41:47 +0000 (12:41 +0300)]
Allow overriding of CopyPasteHandler and Paster methods

Changed some method signatures from private to protected for
inheritance purposes.

refs #7125

Change-Id: Ib66104a271d18824ad1f397e4a48e89086f694cd

4 years agoSlightly improved diagnostics in ExtendedUris 92/392/2
Antti Villberg [Mon, 3 Apr 2017 07:22:35 +0000 (10:22 +0300)]
Slightly improved diagnostics in ExtendedUris

refs #7120

Change-Id: I22cde4ac4dbd9c0542316889670925c40918b3bb

4 years agoMove graph file document codes around a bit 90/390/1
Antti Villberg [Mon, 3 Apr 2017 07:19:37 +0000 (10:19 +0300)]
Move graph file document codes around a bit

refs #7118

Change-Id: I8a1036a8717b74f3e57b5ea2519de27fb9dc2eab

4 years agoReplaced use of deprecated BinaryFunction et al with BiFunction et al 87/387/2
Tuukka Lehtonen [Fri, 31 Mar 2017 13:14:02 +0000 (16:14 +0300)]
Replaced use of deprecated BinaryFunction et al with BiFunction et al

Also added missing logic to GraphExplorerComposite.SelectionElement to
discover Resource from Variable when WorkbenchSelectionElement is asked
for AnyResource. This is part of the fix for #7116.

Fixed breakage from ContextualHelp F1 keystroke handler which was
introduced in the original SVN commit r32734 (#6446).

refs #7116
refs #7117

Change-Id: Ia7c88d2c1b274fd788a0a18d95c2f059cea36086

4 years agoFixed target definition files after commit:e6d39241.
Tuukka Lehtonen [Fri, 31 Mar 2017 09:13:05 +0000 (12:13 +0300)]
Fixed target definition files after commit:e6d39241.

refs #7114

4 years agoReversioned org.jdom2 from 2.0.6 to 2.0.6.b0001
Tuukka Lehtonen [Fri, 31 Mar 2017 09:05:47 +0000 (12:05 +0300)]
Reversioned org.jdom2 from 2.0.6 to 2.0.6.b0001

This ensures that people loading the target platform will
receive the correct version of the plug-in. Currently developers
still have old cached versions of the old bundle with version
2.0.6 that the system unwantedly keeps loading while P2 should
be loading the correct file on the web. The only way to prevent
this is to bump the version qualifier stamp to force downloads.

refs #7114

4 years agoImport/export changes. A load. 51/351/13
Antti Villberg [Wed, 8 Mar 2017 14:50:59 +0000 (16:50 +0200)]
Import/export changes. A load.

May cause some problems. Exports create Internals instead of blanks if
possible. FixExportedOntology treatment now produces tgs that are
compatible with Graph Compiler. Import creates L0.ExternalEntity
instances for unresolved external references (thus making it fail safe).

Note that addBuiltin("http://Projects") was removed from class
CoreInitialization because its existence resulted in a non-functioning
URI space because:
* http://Projects was added as a "built-in resource" when the database
is first initialized which means that
ReadGraph.getResource("http://Projects") would succeed even when the
resource was not yet properly imported from the project ontology
* When the project ontology is imported, a new resource is created to
represent http://Projects instead of using the existing uninitialized
"built-in resource". The L0.ExternalEntity changes made to the standard
transferable graph import in this patch caused the code to find the
built-in resource for "http://Projects" and think that it has to be a
resource that's already properly initialized. This led to the TG import
not initializing the resource at all. Previously there was a bug here as
well but it was hidden by the fact that the system would import the
actual/new "http://Projects" resource from the ontology anyway. This
effectively left the uninitialized built-in resource just hanging in the
database as trash.

refs #7016

Change-Id: I5d9dd8dea4df58cc54d4a6664c112a770ae7f7b3

4 years agoBumped master target and org.simantics.sdk feature versions to 1.29.0.
Tuukka Lehtonen [Thu, 30 Mar 2017 14:09:01 +0000 (17:09 +0300)]
Bumped master target and org.simantics.sdk feature versions to 1.29.0.

refs #7114

4 years agoAdded base diagram profile style for showing terminal names on diagrams 83/383/1
Tuukka Lehtonen [Tue, 28 Mar 2017 15:02:18 +0000 (18:02 +0300)]
Added base diagram profile style for showing terminal names on diagrams

Previously there has been an implementation for showing terminal names
in the symbol editor (SymbolTerminalNameStyle). This implementation is
for showing symbol instance terminal names on modelling diagrams
containing symbol instances. The names are positioned outside the
current symbol's bounding box.

ConnectionPointNameStyle also employs the new TextNode automatic text
flipping feature added in #7112.

refs #7107

Change-Id: Icf4709bf115a9c25b894192d186c6ce514cc0d29

4 years agoAdded automatic text flipping option for text readability in TextNode 82/382/1
Tuukka Lehtonen [Tue, 28 Mar 2017 14:55:13 +0000 (17:55 +0300)]
Added automatic text flipping option for text readability in TextNode

refs #7112

Change-Id: I6027ff66e3bc60d81385088fcf072e09dff7e6a7