jsimomaa [Wed, 28 Dec 2016 14:03:13 +0000 (16:03 +0200)]
Ensure GetElementClassRequest is not constructed without elementFactory
refs #6898
Change-Id: I905188f352bbaeae7787d817e7b0835a36138abf
jsimomaa [Wed, 28 Dec 2016 14:01:51 +0000 (16:01 +0200)]
Remove unused import in DeleteHandler
refs #6898
Change-Id: I555641ab201e50e35a17e6e3d3b68d97638f701d
jsimomaa [Wed, 28 Dec 2016 14:01:24 +0000 (16:01 +0200)]
List the unsatisfied dependencies in CanvasContext
refs #6898
Change-Id: I07de49394e871d27f6df172c02cfdff05cde44b1
jsimomaa [Wed, 28 Dec 2016 14:00:09 +0000 (16:00 +0200)]
Adding more detailed message to thrown exceptions in SyncElementFactory
refs #6898
Change-Id: I7d9c2b175f25d06b84fbda8938875bb8ab824f81
Tuukka Lehtonen [Thu, 15 Dec 2016 12:44:35 +0000 (14:44 +0200)]
Merge "Set tycho-packaging-plugin qualifier format to 'v'yyyyMMdd-HHmmss"
Tuukka Lehtonen [Thu, 15 Dec 2016 12:37:31 +0000 (14:37 +0200)]
Set tycho-packaging-plugin qualifier format to 'v'yyyyMMdd-HHmmss
refs #6621
Change-Id: I0ebfcf451f2f7a909bb888d62e772f223a205379
Antti Villberg [Wed, 14 Dec 2016 07:19:47 +0000 (09:19 +0200)]
Document server should use variable value request with binding
refs #6876
Change-Id: I772b301b7b66f60e2834d01e9a1a7b1d300adb26
Antti Villberg [Wed, 14 Dec 2016 06:07:24 +0000 (08:07 +0200)]
Add VariableValueWithBinding request into db.layer0
refs #6875
Change-Id: If71e9d082473bfcf54314e376a39d610df05c987
Antti Villberg [Mon, 12 Dec 2016 09:56:51 +0000 (11:56 +0200)]
An attempt to resolve this issue for good
refs #6169
Change-Id: Ia06d08568fa37b9a575f924dc35be5fe3fa1a941
Hannu Niemistö [Mon, 12 Dec 2016 09:05:07 +0000 (11:05 +0200)]
Merge "ValueConversion.parsePrimitive consumes NumberFormatException silently"
Tuukka Lehtonen [Mon, 12 Dec 2016 07:45:04 +0000 (09:45 +0200)]
Merge "Moved File menu Export and Import contributions to separate feature. "
Antti Villberg [Thu, 8 Dec 2016 09:08:39 +0000 (11:08 +0200)]
Moved File menu Export and Import contributions to separate feature.
The contributions were previously in org.simantics.desktop.ui. It was
deemed best to move them to a separate plug-in and feature
(org.simantics.modeling.ui.workbench) to make it possible to prevent
forcefully including the contributions in all Simantics products.
refs #6856
Change-Id: If8a55a68113ff500fc1baccc317c172bc2d60a48
Antti Villberg [Sun, 11 Dec 2016 18:22:16 +0000 (20:22 +0200)]
Support for console discovery
refs #6864
Change-Id: I9a7b7bceffab1bd1a501d32c295c6da81c52aafc
Jussi Koskela [Fri, 9 Dec 2016 13:55:00 +0000 (15:55 +0200)]
ValueConversion.parsePrimitive consumes NumberFormatException silently
Don't catch the exception since we want to be aware of the problem at
top level.
refs #6863
Change-Id: I4b09a0e705b2e6fdd62c3b59bc70e5c188abb59f
Tuukka Lehtonen [Thu, 8 Dec 2016 21:48:11 +0000 (23:48 +0200)]
Fixed labels for search results restored from previous search memento
Also made the details label shown at the bottom of the dialog for the
selected entry a bit more legible. The URI that was previously shown is
now a root relative unescaped path for results contained by a model
root.
refs #6855
Change-Id: Iccd0762707d938009ea046f4ac8ef20571e353a1
Antti Villberg [Thu, 8 Dec 2016 09:26:05 +0000 (11:26 +0200)]
Removed obsolete structural browser.
The current browser id is org.simantics.modeling.ui.browser and it is
contributed by org.simantics.desktop.ui.
refs #6857
Change-Id: Ib04f6c8be83409c8fc44c7267839cb1adca8c388
Antti Villberg [Thu, 8 Dec 2016 09:06:36 +0000 (11:06 +0200)]
Re-enabled CTRL+SHIFT+R resource search dialog in org.simantics.debug.ui
This fixes the old problem where the index searches were not limited to
e.g. a 1000 hits but to Integer.MAX_VALUE instead. If the user happened
to write 'a' into the search field, this would return pretty much every
indexed resource and kill the JVM eventually.
This also fixes a problem from
org.simantics.modeling.ui.diagramEditor.DiagramViewer which did not
check diagram resource immutability before attempting to write a diagram
page description to it because it was missing. This can happen if you
use the resource search dialog to open e.g. diagram symbols from the
ontologies.
refs #6855
Change-Id: Id341871847e0ea8bdbc036e8023821ab0556a3cb
Antti Villberg [Wed, 7 Dec 2016 13:43:02 +0000 (15:43 +0200)]
Added ResourceWorkbenchSelectionElement
refs #6853
Change-Id: I878cc7d463ae30090ba55a886e59d7ed2c4fd647
Tuukka Lehtonen [Tue, 6 Dec 2016 12:33:30 +0000 (14:33 +0200)]
Merge commit '
876ede6'
Conflicts:
bundles/org.simantics.acorn/build.properties
bundles/org.simantics.charts/META-INF/MANIFEST.MF
features/org.simantics.acorn.feature/.project
Tuukka Lehtonen [Tue, 6 Dec 2016 12:30:40 +0000 (14:30 +0200)]
Sync git svn branch with SVN repository r33406.
Marko Luukkainen [Mon, 5 Dec 2016 15:27:08 +0000 (17:27 +0200)]
RouteGraph related methods are now public for code reuse
refs #3832
Change-Id: I44e4a4ca72aea8c7514faa24533602dfeb4b565c
Tuukka Lehtonen [Wed, 30 Nov 2016 14:14:43 +0000 (16:14 +0200)]
Removed useless TODO comment from TrendNode.
refs #6547
[PRIVATE-11736]
Change-Id: I0d9b7f0ed0ba60d33ac5030813c6912900197e47
Tuukka Lehtonen [Wed, 30 Nov 2016 13:48:51 +0000 (15:48 +0200)]
Added support for JSON PlainTextTransferable to charts and subscriptions
With these changes dragging JSON text using
org.simantics.ui.dnd.PlainTextTransfer on top of model browser charts
and subscriptions and also on a chart editor is now supported.
The dragged JSON data must be in the following format:
<pre>
{
"type" : "variable",
"uri" : "variable space URI to dragged entity",
"defaultPropertyUri" : "variable space URI to default referenced
property variable of the dragged entity"
}
</pre>
Only "type" and "defaultPropertyUri" keys are required.
refs #6844
Change-Id: I3684a879a6c80bbff812166d14aa28eac5244663
Tuukka Lehtonen [Wed, 30 Nov 2016 12:57:40 +0000 (14:57 +0200)]
Fixed regression in TrendNode.
The regression was caused by change r32901 and merge r32981. The problem
was that the code tried to keep existing VertRuler nodes alive as much
as possible to keep their (transient) settings in place between chart
configuration reloads. However the code failed to do this correctly and
caused IndexOutOfBoundsExceptions and other corollary failures.
This fix needs to go into platform branches 1.22.2 and 1.22 as well.
refs #6547
[PRIVATE-11736]
Change-Id: Idb7d9d77b1a6b0bf513a5829b4c373cde9747529
Tuukka Lehtonen [Mon, 28 Nov 2016 17:20:29 +0000 (19:20 +0200)]
Fixed bounds calculation for flags and diagram profile monitors.
NodeUtil.getLocalElementBounds did not recognize flag table flags from
the scene graph. Also TextGridStyle.calculateStyle used wrong method for
transform calculation which causes profile monitors to be positioned
incorrectly.
refs #6837
refs #6812
[PRIVATE-12779]
[PRIVATE-8884]
Change-Id: I0700b969347a692ed8d4ff8ec0a5d2c3be781fc1
Tuukka Lehtonen [Mon, 28 Nov 2016 13:34:36 +0000 (15:34 +0200)]
Include org.apache.batik/1.8.0 in org.simantics.g2d feature.
After including org.simantics.diagram.svg into the org.simantics.g2d
feature in commit:
229196a1cb46a94d1cc5f75aef7f822157ba7917, the feature
started requiring org.apache.batik(/1.8.0). However, it is not included
by the feature which can cause product/feature configurations to be
invalid.
refs #6621
Change-Id: I4a30c0ae569d64e2acccb35a3345d795accc8d5f
Tuukka Lehtonen [Mon, 28 Nov 2016 12:59:06 +0000 (14:59 +0200)]
Merge "Remove deprecated SIMANTICS-README.mediawiki."
Tuukka Lehtonen [Mon, 28 Nov 2016 12:51:34 +0000 (14:51 +0200)]
Remove deprecated SIMANTICS-README.mediawiki.
Currently org.simantics.workbench feature includes this old and
deprecated file as a root file to all product builds that include this
feature.
refs #6835
Change-Id: I5a128bf6ac32d2aee7d3b392ca26045f915fb064
Miro Richard Eklund [Mon, 28 Nov 2016 09:15:15 +0000 (11:15 +0200)]
UCs can have their own SCLModule definitions
User Components now see their own SCLModule definitions without
including them to the index roots SCLMain. Makes UCs more individual and
eases the usage of them.
refs #6514
Change-Id: I55e5bc78a1dc93382d9ca8d3ea78837baa59fe28
Tuukka Lehtonen [Fri, 25 Nov 2016 14:45:37 +0000 (16:45 +0200)]
Re-export org.simantics.db.management dependency from org.simantics.
org.simantics has API that publishes/uses interface ISessionContext. It
is defined in org.simantics.db.management plug-in. Therefore
org.simantics.db.managment must be re-exported.
refs #6795
Change-Id: Ieec3e0c8dcb02876057a0a351b426e0d915d7b16
Tuukka Lehtonen [Fri, 25 Nov 2016 14:44:01 +0000 (16:44 +0200)]
Merge "Introduce utility class org.simantics.db.function.DbOptional<T>."
Tuukka Lehtonen [Fri, 25 Nov 2016 14:03:50 +0000 (16:03 +0200)]
Include jackson-core in org.simantics.scl feature.
org.simantics.scl.data now requires jackson-core so it needs to be
included in the feature that also includes org.simantics.scl.data.
refs #6683
Change-Id: I275b8ee3dc72cd8871026df8c1e362474edac902
Tuukka Lehtonen [Fri, 25 Nov 2016 10:03:27 +0000 (12:03 +0200)]
Introduce utility class org.simantics.db.function.DbOptional<T>.
The class is a direct copy of java.util.Optional<T> but it uses
DbConsumer, DbFunction, DbPredicate and DbSupplier instead of the
standard Java 1.8 functional interfaces to allow the DbOptional methods
to throw DatabaseExceptions for cleaner database code in certain
situations.
The rationale behind this class is much the same as with the standard
optional. See e.g.
http://www.oracle.com/technetwork/articles/java/java8-optional-
2175753.html.
refs #6829
Change-Id: Ibf62a56eb227264cbfac359aca99d87570b68a47
Hannu Niemistö [Fri, 25 Nov 2016 11:25:36 +0000 (13:25 +0200)]
Added jackson dependency to org.simantics.scl.data for Data/Json
Change-Id: Ie11a770e88808b99fe0d3a3919969d45235a7835
Tuukka Lehtonen [Fri, 25 Nov 2016 13:08:24 +0000 (15:08 +0200)]
Include Jackson XML/CSV dataformat libraries in external components
The following new bundles were added:
* com.fasterxml.jackson.core.jackson-annotations/2.8.0
* com.fasterxml.jackson.core.jackson-databind/2.8.5
* com.fasterxml.jackson.dataformat.jackson-dataformat-csv/2.8.5
* com.fasterxml.jackson.dataformat.jackson-dataformat-xml/2.8.5
* com.fasterxml.jackson.module.jackson-module-jaxb-annotations/2.8.5
* com.fasterxml.woodstox.woodstox-core/5.0.3
* stax2-api/3.1.4
The following upgrades were done:
* net.ucanaccess/3.0.6 -> 3.0.7
refs #6830
Change-Id: I7ec6ad098d9c2ad8d84faa0a444aa6afd02b0826
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
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
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
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
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
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
Antti Villberg [Tue, 22 Nov 2016 11:47:55 +0000 (13:47 +0200)]
Initial version of SVG tab contribution
refs #6825
Change-Id: I412379dcd53e307962b807b087cf6e243fe37b03
Antti Villberg [Tue, 22 Nov 2016 11:47:55 +0000 (13:47 +0200)]
Initial version of SCL tab contributions
refs #6824
Change-Id: I677f82bc7a0cd5ec03937384d9a130c00ddefa9b
Tuukka Lehtonen [Tue, 22 Nov 2016 11:05:07 +0000 (13:05 +0200)]
Merge commit '
b9450ae'
refs #6812
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
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
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
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
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
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
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
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
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
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
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
jsimomaa [Thu, 17 Nov 2016 08:31:56 +0000 (10:31 +0200)]
Fixing wrong ID's for modelled tests
refs #6726
Change-Id: Ibf9cda50e406e1e84d8afb28760cbe06f6a03b9a
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
Tuukka Lehtonen [Wed, 16 Nov 2016 13:49:21 +0000 (15:49 +0200)]
Sync git svn branch with SVN repository r33392.
refs #6751
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
Tuukka Lehtonen [Wed, 16 Nov 2016 07:43:37 +0000 (09:43 +0200)]
Sync git svn branch with SVN repository r33390.
refs #6809
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
Tuukka Lehtonen [Fri, 11 Nov 2016 10:38:20 +0000 (12:38 +0200)]
Sync git svn branch with SVN repository r33389.
refs #6726
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]
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]
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]
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]
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
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
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
Antti Villberg [Wed, 9 Nov 2016 09:58:38 +0000 (11:58 +0200)]
Fixed to remove duplicates
refs #6797
Change-Id: Ifb3bd95855c47b3cf424a1ec7ee5364b3aef4597
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
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
Tuukka Lehtonen [Mon, 7 Nov 2016 20:33:53 +0000 (22:33 +0200)]
Sync git svn branch with SVN repository r33368.
refs #6459
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
Tuukka Lehtonen [Mon, 7 Nov 2016 19:42:56 +0000 (21:42 +0200)]
Sync git svn branch with SVN repository r33366.
refs #6793
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
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
Tuukka Lehtonen [Tue, 25 Oct 2016 05:50:44 +0000 (08:50 +0300)]
Merge commit '
e87f096'
refs #6786
Tuukka Lehtonen [Tue, 25 Oct 2016 05:50:09 +0000 (08:50 +0300)]
Sync git svn branch with SVN repository r33359.
refs #6786
Tuukka Lehtonen [Sun, 23 Oct 2016 20:39:30 +0000 (23:39 +0300)]
Merge commit '
2a46c55'
refs #6502
Tuukka Lehtonen [Sun, 23 Oct 2016 20:38:15 +0000 (23:38 +0300)]
Sync git svn branch with SVN repository r33358.
refs #6502
Tuukka Lehtonen [Thu, 20 Oct 2016 11:49:54 +0000 (14:49 +0300)]
Merge commit '
3efd7d44a55ae1fff284a1826e7c9afe27e0815e'
refs #6600
refs #6774
refs #6780
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
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
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
Jani Simomaa [Mon, 17 Oct 2016 07:41:11 +0000 (10:41 +0300)]
Merge "InputStream returns -1 on EOF instead of throwing IOException"
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
Tuukka Lehtonen [Fri, 14 Oct 2016 12:02:52 +0000 (15:02 +0300)]
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
Tuukka Lehtonen [Wed, 12 Oct 2016 08:17:39 +0000 (11:17 +0300)]
Merge commit '
bd5bc6e45f700e755b61bd112631796631330ecb'
refs #6751 [PRIVATE-12404]
refs #6752 [PRIVATE-12401]
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]
Tuukka Lehtonen [Tue, 11 Oct 2016 09:42:05 +0000 (12:42 +0300)]
Merge "Databoard and SCL enchancements."
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
Tuukka Lehtonen [Mon, 10 Oct 2016 12:05:41 +0000 (15:05 +0300)]
Merge commit '
7684bae'
refs #6744 [PRIVATE-5991]
refs #6745
refs #6748
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
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
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
Tuukka Lehtonen [Wed, 5 Oct 2016 21:30:01 +0000 (00:30 +0300)]
Merge commit '
0915910'
refs #6742
refs #6741
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
Tuukka Lehtonen [Tue, 4 Oct 2016 20:11:38 +0000 (23:11 +0300)]