]> gerrit.simantics Code Review - simantics/platform.git/log
simantics/platform.git
8 years agoInclude org.simantics.{fileimport,spreadsheet.fileimport} in SDK build. 69/169/1
Tuukka Lehtonen [Thu, 24 Nov 2016 14:40:39 +0000 (16:40 +0200)]
Include org.simantics.{fileimport,spreadsheet.fileimport} in SDK build.

org.simantics.spreadsheet.fileimport needs org.simantics.fileimport and
org.simantics.spreadsheet isn't actually in any way dependent on other
org.simantics.spreadsheet plug-ins.

refs #6621

Change-Id: I79723b78aacf5397167dc8b274d4c51c400dcc00

8 years agoLots of small fixes for the Simantics SDK build 66/166/4
Tuukka Lehtonen [Wed, 23 Nov 2016 22:24:30 +0000 (00:24 +0200)]
Lots of small fixes for the Simantics SDK build

* org.apache.batik/1.8.0 is taken from external-components/manual now.
  Removed it from this repository.
* org.simantics.sdk now includes plenty of previously missing plug-ins
and features: org.simantics.help.*,
org.simantics.spreadsheet.fileimport, org.apache.pdfbox*,
org.simantics.tests.modelled*, org.simantics.diagram.svg,
org.simantics.browsing.ui.nattable*
* many build.properties fixes, e.g. removal of non-existent files and
addition of missing binary/source artifacts
* added new feature org.simantics.help.addons to bundle together all the
recently added org.simantics.help.* plug-ins for modelled help page
construction in the Simantics Desktop workbench.
* added new feature org.simantics.browsing.ui.nattable.feature to gather
together org.simantics.browsing.ui.nattable and its external component
dependencies (nattable.core, fastutil)
refs #6621

Change-Id: I203c1fac381325d59925e19e26ee338db7ff9852

8 years agoMerge changes I8832696c,I7ff3a4d5
Tuukka Lehtonen [Wed, 23 Nov 2016 13:17:14 +0000 (15:17 +0200)]
Merge changes I8832696c,I7ff3a4d5

* changes:
  Refactored RouteGraphConnectionClassFactory code into RouteGraphUtils
  Fixed record-type value editing in the old property tab implementation

8 years agoRefactored RouteGraphConnectionClassFactory code into RouteGraphUtils 64/164/1
Tuukka Lehtonen [Wed, 23 Nov 2016 13:00:55 +0000 (15:00 +0200)]
Refactored RouteGraphConnectionClassFactory code into RouteGraphUtils

This concludes a refactoring started over 4 years ago.

refs #3832

Change-Id: I8832696c12038c74d0e28a7f0851de142d947a48

8 years agoFixed record-type value editing in the old property tab implementation 63/163/1
Tuukka Lehtonen [Wed, 23 Nov 2016 12:43:43 +0000 (14:43 +0200)]
Fixed record-type value editing in the old property tab implementation

refs #4583

Change-Id: I7ff3a4d57df864a38132c7551dedb829d5d78036

8 years agoSVG editor tab contribution did not work due to missing SCL include 62/162/1
Jussi Koskela [Wed, 23 Nov 2016 10:20:12 +0000 (12:20 +0200)]
SVG editor tab contribution did not work due to missing SCL include

refs #6825
Change-Id: Ia11388204986d9dbbd6cd432f0c4d3f15e4c523d

8 years agoInitial version of SVG tab contribution 60/160/3
Antti Villberg [Tue, 22 Nov 2016 11:47:55 +0000 (13:47 +0200)]
Initial version of SVG tab contribution

refs #6825

Change-Id: I412379dcd53e307962b807b087cf6e243fe37b03

8 years agoInitial version of SCL tab contributions 59/159/4
Antti Villberg [Tue, 22 Nov 2016 11:47:55 +0000 (13:47 +0200)]
Initial version of SCL tab contributions

refs #6824

Change-Id: I677f82bc7a0cd5ec03937384d9a130c00ddefa9b

8 years agoMerge commit 'b9450ae'
Tuukka Lehtonen [Tue, 22 Nov 2016 11:05:07 +0000 (13:05 +0200)]
Merge commit 'b9450ae'

refs #6812

8 years agoFixed Typical inheritance profile style implementation for I/O tables
Tuukka Lehtonen [Tue, 22 Nov 2016 11:04:13 +0000 (13:04 +0200)]
Fixed Typical inheritance profile style implementation for I/O tables

Now all transforms are calculated properly using
DiagramGraphUtil.getDynamicWorldTransform in
the default case. This fixes the highlights for flags
that are attached to a diagram template flag table.

refs #6812

8 years agoInclude org.apache.poi.feature in org.simantics.spreadsheet feature. 58/158/2
Tuukka Lehtonen [Tue, 22 Nov 2016 07:16:22 +0000 (09:16 +0200)]
Include org.apache.poi.feature in org.simantics.spreadsheet feature.

This replaces the inclusion of only the org.apache.poi plug-in which
does not include all the dependencies required by Apache POI.

Also, exclude source org.apache.poi[.feature] source bundles from build.
Since there is no source bundle for org.apache.poi 3.15.0 so we must
exclude it from the build to get the build to pass.

refs #6813

Change-Id: Id5f388596c73f1ec58f93c884ad630e40f74d24c

8 years agoInclude org.apache.poi 3.15.0.b0002 feature in target platform 57/157/1
Tuukka Lehtonen [Tue, 22 Nov 2016 06:00:22 +0000 (08:00 +0200)]
Include org.apache.poi 3.15.0.b0002 feature in target platform

refs #6813

Change-Id: I9c90784a8e5e6c647fe8370b65ea60393164ba32

8 years agoPossibility to skip bytes when reading InputStream in SCL 54/154/1
Jussi Koskela [Mon, 21 Nov 2016 12:53:42 +0000 (14:53 +0200)]
Possibility to skip bytes when reading InputStream in SCL

Lift InputStream.skip() to SCL API.

refs #6821
Change-Id: I2462d9474b4eedb5010deb8737cccb507905ba11

8 years agoIntroduce WrapLayout to replace FlowLayout 52/152/3
Jussi Koskela [Mon, 21 Nov 2016 08:21:09 +0000 (10:21 +0200)]
Introduce WrapLayout to replace FlowLayout

FlowLayout does not really flow components into separate lines when they
overrun their horizontal space. WrapLayout does this.

Also moved the contents of org.simantics.utils.ui.awt into
org.simantics.utils.ui.internal.awt since that code was never meant for
public use. Moved WrapLayout into org.simantics.utils.ui.awt and
published that package.

refs #6814

Change-Id: I65600f9a5edff021ab011d980bb3352f6141177f

8 years agoDepend only on org.apache.poi/3.15.0. 51/151/2
Tuukka Lehtonen [Sun, 20 Nov 2016 22:37:23 +0000 (00:37 +0200)]
Depend only on org.apache.poi/3.15.0.

refs #6813

Change-Id: Ibb75d457a908e43ee01a8579d3bd4c1414c6d20a

8 years agoUse direct repository links instead of composite repository link. 49/149/1
Tuukka Lehtonen [Sun, 20 Nov 2016 22:11:57 +0000 (00:11 +0200)]
Use direct repository links instead of composite repository link.

There seems to be problems with Tycho and composite repositories and
furthermore, otherwise the composite repository would always have to be
bumped separately to get updates to clients.

refs #6813

Change-Id: I90f164f8df1048340b30fb6f2c33823323a0c632

8 years agoCleaned up external components list in target platform definition 44/144/1
Tuukka Lehtonen [Sun, 20 Nov 2016 09:49:20 +0000 (11:49 +0200)]
Cleaned up external components list in target platform definition

refs #6813

Change-Id: Ia8bfa159767af3e088cc3ba38fbec7fa2e494e48

8 years agoAdded back dependencies of org.apache.poi 3.15. 43/143/1
Tuukka Lehtonen [Sun, 20 Nov 2016 09:08:47 +0000 (11:08 +0200)]
Added back dependencies of org.apache.poi 3.15.

Added org.apache.commons.codec, org.apache.commons.logging,
com.github.virtuald.curvesapi, org.apache.xmlbeans back to external
components to be used by org.apache.poi 3.15 which will be manually
bundled.

refs #6813

Change-Id: I9dbd405a0106a8b05e22d35bcf7a187584b86e57

8 years agoAdded org.apache.commons.collections4 as external component. 42/142/2
Tuukka Lehtonen [Sun, 20 Nov 2016 08:20:36 +0000 (10:20 +0200)]
Added org.apache.commons.collections4 as external component.

This change also removes org.apache.poi.{,ooxml,ooxml-schemas} from the
external components as preparation for including manually bundled
org.apache.poi bundle version 3.15.0. org.apache.commons.collections4
was added because it is a dependency of this new version of POI.

Due to org.apache.poi.{,ooxml,ooxml-schemas} containing split packages
it is just easier to bundle the POI JARs into a single bundle to keep
bundle class loading happy.

refs #6813

Change-Id: Iefd4b52c0fafc4a0e7b6b9ed2bf6bac0e38a113e

8 years agoAdding org.simantics.acorn.feature 41/141/3
jsimomaa [Thu, 17 Nov 2016 08:42:58 +0000 (10:42 +0200)]
Adding org.simantics.acorn.feature

Adding to features/pom.xml - fixing tabs to spaces

refs #6726

Change-Id: Ifbb02b4b63d86dd8cfa35c3854d12f5bf4e86c57

8 years agoFixing wrong ID's for modelled tests 40/140/1
jsimomaa [Thu, 17 Nov 2016 08:31:56 +0000 (10:31 +0200)]
Fixing wrong ID's for modelled tests

refs #6726

Change-Id: Ibf9cda50e406e1e84d8afb28760cbe06f6a03b9a

8 years agoMerge commit 'b3da313'
Tuukka Lehtonen [Wed, 16 Nov 2016 13:50:07 +0000 (15:50 +0200)]
Merge commit 'b3da313'

Sync git svn branch with SVN repository r33392.

refs #6751

8 years agoSync git svn branch with SVN repository r33392.
Tuukka Lehtonen [Wed, 16 Nov 2016 13:49:21 +0000 (15:49 +0200)]
Sync git svn branch with SVN repository r33392.

refs #6751

8 years agoMerge commit '5da68e7'
Tuukka Lehtonen [Wed, 16 Nov 2016 07:44:22 +0000 (09:44 +0200)]
Merge commit '5da68e7'

Sync git svn branch with SVN repository r33390.

refs #6809

8 years agoSync git svn branch with SVN repository r33390.
Tuukka Lehtonen [Wed, 16 Nov 2016 07:43:37 +0000 (09:43 +0200)]
Sync git svn branch with SVN repository r33390.

refs #6809

8 years agoMerge commit 'd7afa23'
Tuukka Lehtonen [Fri, 11 Nov 2016 10:41:05 +0000 (12:41 +0200)]
Merge commit 'd7afa23'

Conflicts:
bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java

Sync git svn branch with SVN repository r33389.

refs #6726

8 years agoSync git svn branch with SVN repository r33389.
Tuukka Lehtonen [Fri, 11 Nov 2016 10:38:20 +0000 (12:38 +0200)]
Sync git svn branch with SVN repository r33389.

refs #6726

8 years agoMerge commit 'c46f0ff'
Tuukka Lehtonen [Thu, 10 Nov 2016 21:45:11 +0000 (23:45 +0200)]
Merge commit 'c46f0ff'

Sync git svn branch with SVN repository r33386.

refs #6803
[PRIVATE-12714]

8 years agoSync git svn branch with SVN repository r33386.
Tuukka Lehtonen [Thu, 10 Nov 2016 21:44:37 +0000 (23:44 +0200)]
Sync git svn branch with SVN repository r33386.

refs #6803
[PRIVATE-12714]

8 years agoMerge commit '31664b6'
Tuukka Lehtonen [Wed, 9 Nov 2016 22:23:08 +0000 (00:23 +0200)]
Merge commit '31664b6'

Sync git svn branch with SVN repository r33382.

refs #6803
[PRIVATE-12714]

8 years agoSync git svn branch with SVN repository r33382.
Tuukka Lehtonen [Wed, 9 Nov 2016 22:22:14 +0000 (00:22 +0200)]
Sync git svn branch with SVN repository r33382.

refs #6803
[PRIVATE-12714]

8 years agoUse Layer0Utils.getDomainOf 39/139/1
Antti Villberg [Wed, 9 Nov 2016 10:13:36 +0000 (12:13 +0200)]
Use Layer0Utils.getDomainOf

The result can be cached by several uses.

refs #6800

Change-Id: I65c32408b1afdc1ca96de126e7ac86c46896b250

8 years agoStructuralConnection added into Simantics/Structural 38/138/1
Antti Villberg [Wed, 9 Nov 2016 10:11:18 +0000 (12:11 +0200)]
StructuralConnection added into Simantics/Structural

Also added getter structuralConnectionConnectionPoints

refs #6799

Change-Id: If9fe0b432437624b5fa082d042ffac9bd176ebca

8 years agoAdded property SEL.hidden that is tested in VariablePropertyRule 37/137/2
Antti Villberg [Wed, 9 Nov 2016 10:02:47 +0000 (12:02 +0200)]
Added property SEL.hidden that is tested in VariablePropertyRule

refs #6798

Change-Id: I0a23da64589abef202a3ac3ee9a5ee2210703b01

8 years agoFixed to remove duplicates 36/136/1
Antti Villberg [Wed, 9 Nov 2016 09:58:38 +0000 (11:58 +0200)]
Fixed to remove duplicates

refs #6797

Change-Id: Ifb3bd95855c47b3cf424a1ec7ee5364b3aef4597

8 years agoSearch for dependencies in all available bundles. 35/135/1
Antti Villberg [Wed, 9 Nov 2016 09:53:19 +0000 (11:53 +0200)]
Search for dependencies in all available bundles.

refs #6796

Change-Id: I1e9c34ed5f617c7e872d95a22b45e136de5d643e

8 years agoMerge commit 'd186091'
Tuukka Lehtonen [Mon, 7 Nov 2016 20:34:54 +0000 (22:34 +0200)]
Merge commit 'd186091'

Sync git svn branch with SVN repository r33368.

refs #6459

8 years agoSync git svn branch with SVN repository r33368.
Tuukka Lehtonen [Mon, 7 Nov 2016 20:33:53 +0000 (22:33 +0200)]
Sync git svn branch with SVN repository r33368.

refs #6459

8 years agoMerge commit 'a2a4242'
Tuukka Lehtonen [Mon, 7 Nov 2016 19:43:34 +0000 (21:43 +0200)]
Merge commit 'a2a4242'

Sync git svn branch with SVN repository r33366.

refs #6793

8 years agoSync git svn branch with SVN repository r33366.
Tuukka Lehtonen [Mon, 7 Nov 2016 19:42:56 +0000 (21:42 +0200)]
Sync git svn branch with SVN repository r33366.

refs #6793

8 years agoMerge commit '53059ca'
Tuukka Lehtonen [Thu, 3 Nov 2016 20:33:39 +0000 (22:33 +0200)]
Merge commit '53059ca'

Conflicts:
bundles/org.simantics.scl.runtime/scl/Prelude.scl

refs #6726
refs #6788
refs #6791

8 years agoSync git svn branch with SVN repository r33364.
Tuukka Lehtonen [Thu, 3 Nov 2016 20:16:31 +0000 (22:16 +0200)]
Sync git svn branch with SVN repository r33364.

refs #6726
refs #6788
refs #6791

8 years agoMerge commit 'e87f096'
Tuukka Lehtonen [Tue, 25 Oct 2016 05:50:44 +0000 (08:50 +0300)]
Merge commit 'e87f096'

refs #6786

8 years agoSync git svn branch with SVN repository r33359.
Tuukka Lehtonen [Tue, 25 Oct 2016 05:50:09 +0000 (08:50 +0300)]
Sync git svn branch with SVN repository r33359.

refs #6786

8 years agoMerge commit '2a46c55'
Tuukka Lehtonen [Sun, 23 Oct 2016 20:39:30 +0000 (23:39 +0300)]
Merge commit '2a46c55'

refs #6502

8 years agoSync git svn branch with SVN repository r33358.
Tuukka Lehtonen [Sun, 23 Oct 2016 20:38:15 +0000 (23:38 +0300)]
Sync git svn branch with SVN repository r33358.

refs #6502

8 years agoMerge commit '3efd7d44a55ae1fff284a1826e7c9afe27e0815e'
Tuukka Lehtonen [Thu, 20 Oct 2016 11:49:54 +0000 (14:49 +0300)]
Merge commit '3efd7d44a55ae1fff284a1826e7c9afe27e0815e'

refs #6600
refs #6774
refs #6780

8 years agoSync git svn branch with SVN repository r33349.
Tuukka Lehtonen [Thu, 20 Oct 2016 11:48:00 +0000 (14:48 +0300)]
Sync git svn branch with SVN repository r33349.

refs #6600
refs #6774
refs #6780

8 years agoMerge commit '0b471805f017da83d715a0d8409f53bdd009d31e'
Tuukka Lehtonen [Tue, 18 Oct 2016 22:19:39 +0000 (01:19 +0300)]
Merge commit '0b471805f017da83d715a0d8409f53bdd009d31e'

refs #6654
refs #6766
refs #6769
refs #6770
refs #6771
refs #6772
refs #6773

8 years agoSync git svn branch with SVN repository r33345.
Tuukka Lehtonen [Tue, 18 Oct 2016 22:16:53 +0000 (01:16 +0300)]
Sync git svn branch with SVN repository r33345.

refs #6654
refs #6766
refs #6769
refs #6770
refs #6771
refs #6772
refs #6773

8 years agoMerge "InputStream returns -1 on EOF instead of throwing IOException"
Jani Simomaa [Mon, 17 Oct 2016 07:41:11 +0000 (10:41 +0300)]
Merge "InputStream returns -1 on EOF instead of throwing IOException"

8 years agoInputStream returns -1 on EOF instead of throwing IOException 24/124/2
Tuukka Lehtonen [Fri, 14 Oct 2016 13:18:06 +0000 (16:18 +0300)]
InputStream returns -1 on EOF instead of throwing IOException

ClusterSupport2.getValueStreamBig now returns -1 when EOF is reached.
Previously it was invalidly throwing IOException (and before that very
invalidly throwing IllegalStateException).

refs #6741

Change-Id: I220e6bd26b94d92ae1db5a330ca3304035e7614e

8 years agoMerge commit '145a2884933f2ffdd48d6835729e58f1152d274e'
Tuukka Lehtonen [Fri, 14 Oct 2016 12:02:52 +0000 (15:02 +0300)]
Merge commit '145a2884933f2ffdd48d6835729e58f1152d274e'

refs #6654
refs #6756

8 years agoSync git svn branch with SVN repository r33334.
Tuukka Lehtonen [Fri, 14 Oct 2016 12:00:33 +0000 (15:00 +0300)]
Sync git svn branch with SVN repository r33334.

refs #6654
refs #6756

8 years agoMerge commit 'bd5bc6e45f700e755b61bd112631796631330ecb'
Tuukka Lehtonen [Wed, 12 Oct 2016 08:17:39 +0000 (11:17 +0300)]
Merge commit 'bd5bc6e45f700e755b61bd112631796631330ecb'

refs #6751 [PRIVATE-12404]
refs #6752 [PRIVATE-12401]

8 years agoSync git svn branch with SVN repository r33324.
Tuukka Lehtonen [Wed, 12 Oct 2016 08:15:59 +0000 (11:15 +0300)]
Sync git svn branch with SVN repository r33324.

refs #6751 [PRIVATE-12404]
refs #6752 [PRIVATE-12401]

8 years agoMerge "Databoard and SCL enchancements."
Tuukka Lehtonen [Tue, 11 Oct 2016 09:42:05 +0000 (12:42 +0300)]
Merge "Databoard and SCL enchancements."

8 years agoDataboard and SCL enchancements. 21/121/2
Reino Ruusu [Fri, 7 Oct 2016 18:54:29 +0000 (21:54 +0300)]
Databoard and SCL enchancements.

Mapping for generic java.util.Map and java.util.Set references.
Moved databoard-related SCL definitions to a new Databoard module.
Added documentation string to Databoard.scl.
Added a few SCL bindings to potentially useful methods in the Binding
class.

refs #6738

Change-Id: I07369ca5a5ae23966b11ce5ff9787ab07e38af29

8 years agoMerge commit '7684bae'
Tuukka Lehtonen [Mon, 10 Oct 2016 12:05:41 +0000 (15:05 +0300)]
Merge commit '7684bae'

refs #6744 [PRIVATE-5991]
refs #6745
refs #6748

8 years agoSync git svn branch with SVN repository r33319.
Tuukka Lehtonen [Mon, 10 Oct 2016 12:04:10 +0000 (15:04 +0300)]
Sync git svn branch with SVN repository r33319.

refs #6744 [PRIVATE-5991]
refs #6745
refs #6748

8 years agoPlatform startup now reads the used database driver from <ws>/db.ini 20/120/1
Tuukka Lehtonen [Fri, 7 Oct 2016 14:19:48 +0000 (17:19 +0300)]
Platform startup now reads the used database driver from <ws>/db.ini

Previously it was possible to use the wrong database driver for a
workspace if the default driver was changed in the code. Now,
SimanticsPlatform.setupDatabase will read the database driver used for
the opened workspace from an ini file <workspace>/db.ini. If the file
does not exist, it will write it with the following data:
[driver]
id = <database-id-value>

refs #6747

Change-Id: Ie304b480095657e25e694a81cdd5085a4d2c17e9

8 years agoFixed acorn db main.state loading rollback reporting. 19/119/1
Tuukka Lehtonen [Fri, 7 Oct 2016 14:15:11 +0000 (17:15 +0300)]
Fixed acorn db main.state loading rollback reporting.

The previous implementation caused main.state loading to always report
the database as requiring rollback which caused the system to always
delete all indexes on program startup.

refs #6709

Change-Id: Id3d90436c1960faa3ac5ebbc82e817b673934f53

8 years agoMerge commit '0915910'
Tuukka Lehtonen [Wed, 5 Oct 2016 21:30:01 +0000 (00:30 +0300)]
Merge commit '0915910'

refs #6742
refs #6741

8 years agoSync git svn branch with SVN repository r33308.
Tuukka Lehtonen [Wed, 5 Oct 2016 21:29:28 +0000 (00:29 +0300)]
Sync git svn branch with SVN repository r33308.

refs #6742
refs #6741

8 years agoMerge commit '55ca14c'
Tuukka Lehtonen [Tue, 4 Oct 2016 20:11:38 +0000 (23:11 +0300)]
Merge commit '55ca14c'

8 years agoSync git svn branch with SVN repository r33303.
Tuukka Lehtonen [Tue, 4 Oct 2016 20:07:47 +0000 (23:07 +0300)]
Sync git svn branch with SVN repository r33303.

refs #6740
refs #6726
refs #6739
refs #6735
refs #6731
refs #6730
refs #6729
refs #6728
refs #6724
refs #6701
refs #6669

8 years agoImprove Databoard's dynamically typed data capabilities. 17/117/1
Reino Ruusu [Mon, 3 Oct 2016 14:39:33 +0000 (17:39 +0300)]
Improve Databoard's dynamically typed data capabilities.

refs #6738

Change-Id: Iddbcf7e875aefa1bc70430b918cef3656ad97501

8 years agoMerge commit '0580ea8b675c868685993b0780c9ecc31010f681' into master
Tuukka Lehtonen [Fri, 30 Sep 2016 13:32:51 +0000 (16:32 +0300)]
Merge commit '0580ea8b675c868685993b0780c9ecc31010f681' into master

refs #6726

8 years agoMerge commit '3b5069d' into develop
Tuukka Lehtonen [Fri, 30 Sep 2016 13:31:32 +0000 (16:31 +0300)]
Merge commit '3b5069d' into develop

refs #6726

8 years agoSync git svn branch with SVN repository r33290.
Tuukka Lehtonen [Fri, 30 Sep 2016 13:28:29 +0000 (16:28 +0300)]
Sync git svn branch with SVN repository r33290.

refs #6726

8 years agoLogger fixes after merge commit:fdbe8762 14/114/1
Tuukka Lehtonen [Fri, 30 Sep 2016 09:23:53 +0000 (12:23 +0300)]
Logger fixes after merge commit:fdbe8762

refs #6724

Change-Id: I4559a65783b104aadbf8a5797aa6b3edbe128fea
(cherry picked from commit a0b1831418eba8870ca849ef2cd85823aa7bfa0a)

8 years agoLogger fixes after merge commit:fdbe8762 13/113/1
Tuukka Lehtonen [Fri, 30 Sep 2016 09:23:53 +0000 (12:23 +0300)]
Logger fixes after merge commit:fdbe8762

refs #6724

Change-Id: I4559a65783b104aadbf8a5797aa6b3edbe128fea

8 years agoMerge commit 'bf75fd9'
Tuukka Lehtonen [Fri, 30 Sep 2016 08:06:06 +0000 (11:06 +0300)]
Merge commit 'bf75fd9'

Resolved conflicts:
bundles/org.simantics.charts/src/org/simantics/charts/Charts.java

refs #6724
refs #6723
refs #6704
refs #6495

8 years agoSync git svn branch with SVN repository r33269.
Tuukka Lehtonen [Fri, 30 Sep 2016 07:59:43 +0000 (10:59 +0300)]
Sync git svn branch with SVN repository r33269.

refs #6724
refs #6723
refs #6704
refs #6495

8 years agoAdd Koloboke API and Koloboke Compile to target platform 11/111/1
jsimomaa [Wed, 28 Sep 2016 15:49:17 +0000 (18:49 +0300)]
Add Koloboke API and Koloboke Compile to target platform

refs #6725

Change-Id: I279092cc2136525bf6098502eeb75f4affd8bad9

8 years agomerged svn r33251, contains graph.tg changes
Hannu Niemistö [Wed, 28 Sep 2016 06:27:39 +0000 (09:27 +0300)]
merged svn r33251, contains graph.tg changes

8 years agoMerge commit '9d2bb8d'
Tuukka Lehtonen [Tue, 27 Sep 2016 23:23:58 +0000 (02:23 +0300)]
Merge commit '9d2bb8d'

refs #6684

8 years agoSync git svn branch with SVN repository r33251.
Tuukka Lehtonen [Tue, 27 Sep 2016 23:22:03 +0000 (02:22 +0300)]
Sync git svn branch with SVN repository r33251.

refs #6684

8 years agoFixes for non-compiling code after merge 5930811a7
Tuukka Lehtonen [Tue, 27 Sep 2016 23:09:05 +0000 (02:09 +0300)]
Fixes for non-compiling code after merge 5930811a7

8 years agoMerge commit 'ffdf837'
Tuukka Lehtonen [Tue, 27 Sep 2016 22:54:05 +0000 (01:54 +0300)]
Merge commit 'ffdf837'

Resolved conflicts from:
bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/GraphSessionVirtual.java
bundles/org.simantics.db.server/src/org/simantics/db/server/internal/SessionI.java
bundles/org.simantics.db/src/org/simantics/db/Database.java
bundles/org.simantics.db/src/org/simantics/db/service/ClusterSetsSupport.java
bundles/org.simantics.modeling/src/org/simantics/modeling/SCL.java
bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
bundles/org.simantics/src/org/simantics/SimanticsPlatform.java

8 years agoSync git svn branch with SVN repository r33249.
Tuukka Lehtonen [Tue, 27 Sep 2016 22:38:03 +0000 (01:38 +0300)]
Sync git svn branch with SVN repository r33249.

8 years agoUpgrade pdfbox to 2.0.3 and fastutil to 7.0.13 in target platform defs 09/109/1
Tuukka Lehtonen [Tue, 27 Sep 2016 20:59:56 +0000 (23:59 +0300)]
Upgrade pdfbox to 2.0.3 and fastutil to 7.0.13 in target platform defs

Change-Id: Id16d9d58850a655efc5fbe779ea11233ab2d4fb8

8 years agoMerge "Upgrade pdfbox to 2.0.3 and fastutil to 7.0.13."
Tuukka Lehtonen [Tue, 27 Sep 2016 20:51:13 +0000 (23:51 +0300)]
Merge "Upgrade pdfbox to 2.0.3 and fastutil to 7.0.13."

8 years agoUpgrade pdfbox to 2.0.3 and fastutil to 7.0.13. 08/108/1
Tuukka Lehtonen [Tue, 27 Sep 2016 20:50:17 +0000 (23:50 +0300)]
Upgrade pdfbox to 2.0.3 and fastutil to 7.0.13.

Change-Id: I46b772c2a6c15347d33564f87ae2d52b095444e4

8 years agoDB-client fixes 06/106/5
jsimomaa [Tue, 27 Sep 2016 11:00:54 +0000 (14:00 +0300)]
DB-client fixes

* XSupport.rollback for checking if database rolled back
* Separate read and write directory setting and updating in
ClusterSetsSupport

refs #6710

Change-Id: I3395c7042ab3faf2291ed215d4e5830d80b6d2fa

8 years agoWork around one active experiment per model limitation for FMI studio. 04/104/4
jsimomaa [Tue, 27 Sep 2016 10:59:37 +0000 (13:59 +0300)]
Work around one active experiment per model limitation for FMI studio.

refs #6711

Change-Id: I78a98ca08b81828a728f8bd0ab4c338a064a04fd

8 years agoFixing SpreadsheetBookRemover to not fail with URIless resources 05/105/5
jsimomaa [Tue, 27 Sep 2016 11:00:38 +0000 (14:00 +0300)]
Fixing SpreadsheetBookRemover to not fail with URIless resources

refs #6568

Change-Id: Idcf961b7d21ad29fd94010013590e555eaba4c5b

8 years agoAcorn: Fix WriteRunnable.runReally() and other fixes 07/107/2
jsimomaa [Tue, 27 Sep 2016 11:59:56 +0000 (14:59 +0300)]
Acorn: Fix WriteRunnable.runReally() and other fixes

Lets hope this crlf thing is over after this

refs #6709

Change-Id: I4e69d8eebf790c2bf4352c1bc8130ba62f126d2f

8 years agoMerge commit 'd1a82fe'
Tuukka Lehtonen [Mon, 26 Sep 2016 13:08:12 +0000 (16:08 +0300)]
Merge commit 'd1a82fe'

Allow selection of modules to rename through checkboxes and Select All/Clear Selection buttons.

refs #6708
[PRIVATE-11320]

8 years agoAllow selection of modules to rename through checkboxes and Select All/Clear Selectio...
Tuukka Lehtonen [Mon, 26 Sep 2016 13:07:37 +0000 (16:07 +0300)]
Allow selection of modules to rename through checkboxes and Select All/Clear Selection buttons.

refs #6708
[PRIVATE-11320]

8 years agoMerge commit 'bb1507f'
Tuukka Lehtonen [Mon, 26 Sep 2016 10:31:57 +0000 (13:31 +0300)]
Merge commit 'bb1507f'

8 years agoSync git svn branch with SVN repository r33219.
Tuukka Lehtonen [Mon, 26 Sep 2016 10:30:21 +0000 (13:30 +0300)]
Sync git svn branch with SVN repository r33219.

refs #6706
refs #6704
refs #6702
refs #6701

8 years agoUtilize slf4j 93/93/1
Hannu Niemistö [Mon, 26 Sep 2016 06:08:29 +0000 (09:08 +0300)]
Utilize slf4j

Changed System.out/err prints to use logging in several places. Removed
org.simantics.Logging and replaced all uses by slf4j.

Change-Id: Ib0a9f4f87b945fd59130a9dfd02fe02d39ee0eac

8 years agoChanging existing log4j logging to use slf4j 92/92/1
Tuukka Lehtonen [Fri, 23 Sep 2016 21:30:33 +0000 (00:30 +0300)]
Changing existing log4j logging to use slf4j

Removed org.simantics.utils.logging.{Logger,LogManager}. Anybody using
those should just switch to using slf4j. Removed their use from
org.simantics.spreadsheet.graph.

Also changed org.simantics.utils.FileUtils to use slf4j instead of
log4j.

Also added .keep to org.simantics.logback.configuration/src folder to
help it compile properly.

refs #6705

Change-Id: Ib6d78ee964e0a05aedb332167456aee4eea2a4d7
Signed-off-by: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
8 years agoAdding configuration logging for Simantics platform with SLF4J and 90/90/2
jsimomaa [Fri, 23 Sep 2016 13:14:33 +0000 (16:14 +0300)]
Adding configuration logging for Simantics platform with SLF4J and
Logback

Adding logback.xml file to org.simantics.logback.configuration bundle
for configuring logback logging

refs #6705

Change-Id: I67abe04ed0d6a54b6a45fb3591bbb6b5a3991b2a

8 years agoChanged database driver of TestSCLOsgi to acorn 89/89/3
Hannu Niemistö [Fri, 23 Sep 2016 12:48:32 +0000 (15:48 +0300)]
Changed database driver of TestSCLOsgi to acorn

Change-Id: Ie8d92025bb3976a210a8f4d36a0e2d74eea5eb09

8 years agoAutomatic execution of SCL tests in Maven 88/88/1
Hannu Niemistö [Fri, 23 Sep 2016 12:14:20 +0000 (15:14 +0300)]
Automatic execution of SCL tests in Maven

This includes both compiler tests (in
tests/org.simantics.scl.compiler.tests) and a test that checks that all
SCL modules in org.simantics.sdk feature compile (in
tests/org.simantics.scl.osgi.tests).

This commit contains also some modifications to make all SCL
modules compile:
* Disabled Data/Json, because it does not compile (missing jackson)
* Committed away Simantics/Image/linkImage

Change-Id: I22a460d756f65139971f1e7d2cc8624a7a6b8ffb

8 years agoMerge "More Enhance logging for Simantics platform with SLF4J and Logback "
Jani Simomaa [Fri, 23 Sep 2016 10:43:47 +0000 (13:43 +0300)]
Merge "More Enhance logging for Simantics platform with SLF4J and Logback "

8 years agoMore Enhance logging for Simantics platform with SLF4J and Logback 87/87/1
jsimomaa [Fri, 23 Sep 2016 08:47:02 +0000 (11:47 +0300)]
More Enhance logging for Simantics platform with SLF4J and Logback

Changing pom.xml to override generation of ch.qos.logback.classic

refs #6705

Change-Id: I512378d6a583b062c74bffc8c46b743eb2d68305

8 years agoEnhance logging for Simantics platform with SLF4J and Logback 86/86/1
jsimomaa [Fri, 23 Sep 2016 08:47:02 +0000 (11:47 +0300)]
Enhance logging for Simantics platform with SLF4J and Logback

Fixing typo in feature.xml

refs #6705

Change-Id: I2984a5017265389ebede223111c8d78627117ada