simantics/platform.git
2 years agoDisabling display scaling code.
Marko Luukkainen [Thu, 5 Jan 2017 14:45:59 +0000 (16:45 +0200)]
Disabling display scaling code.

refs #6940

Change-Id: If563e24f8a48f9bb85491721a662184fe5d5fa82

2 years agoDisabled debug prints from ResourceEditorInput2 53/253/3
Tuukka Lehtonen [Thu, 5 Jan 2017 12:12:45 +0000 (14:12 +0200)]
Disabled debug prints from ResourceEditorInput2

refs #6936

Change-Id: I92531d321fa753922c9fe126091adba91636db62

2 years agoDon't add repeated commands to SCL Console command history 52/252/1
Hannu Niemistö [Thu, 5 Jan 2017 07:17:47 +0000 (09:17 +0200)]
Don't add repeated commands to SCL Console command history

refs #6939
[PRIVATE-12942]

Change-Id: Ic432851620701a53227b0b76c2e2ac74160bfbbe

2 years agoReplaces stdout/stderr by logging in certain places 51/251/1
Hannu Niemistö [Tue, 3 Jan 2017 11:13:34 +0000 (13:13 +0200)]
Replaces stdout/stderr by logging in certain places

refs #6938

Change-Id: I88f7b5459884d2eddb2624e45d4e1fddedbd5b0c

2 years agoSupport for typed subprocesses 50/250/1
Hannu Niemistö [Mon, 2 Jan 2017 15:14:57 +0000 (17:14 +0200)]
Support for typed subprocesses

Added a method to test if there are pending removals.

[PRIVATE-12928]

Change-Id: I5bf94202209714af0163ef95b61b874a14db0aa8

2 years agoFixed index query and ontology search request behavior 49/249/1
Tuukka Lehtonen [Wed, 4 Jan 2017 13:40:04 +0000 (15:40 +0200)]
Fixed index query and ontology search request behavior

EntityInstances.QueryIndex request did not return proper information
from its isImmutable(ReadGraph) method.

OntologiesFromLibrary in turn did not stop browsing primarily at
L0.IndexRoot instances like it should have to find ontologies.

refs #6937

Change-Id: I262684fdeeee97913308a5aa096a9ea254dbd607

2 years agoFixed IEditorPart reference (memory) leaks from ResourceEditorSupport 48/248/3
Tuukka Lehtonen [Wed, 4 Jan 2017 12:38:06 +0000 (14:38 +0200)]
Fixed IEditorPart reference (memory) leaks from ResourceEditorSupport

ResourceEditorSupport.validationRequest gave IEditorPart as an argument
to UnaryRequest which caused the reference to remain in the DB client's
caches for very long times. This consumed the JVM heap rather quickly
with editors that require a lot of memory and never explicitly free
(nullify) it.

refs #6936

Change-Id: I46bfd107d57dea0493653afdb378dc089fa508a2

2 years agoAllow specification of Locale to FormattingUtils.significantDigitFormat 45/245/3
Tuukka Lehtonen [Tue, 3 Jan 2017 08:35:48 +0000 (10:35 +0200)]
Allow specification of Locale to FormattingUtils.significantDigitFormat

refs #6929

Change-Id: I67b9192ebe8113e44fdbee6d089dbef58b59bc39

2 years agoFixed NPE caused by previous change. 44/244/1
Tuukka Lehtonen [Mon, 2 Jan 2017 20:17:38 +0000 (22:17 +0200)]
Fixed NPE caused by previous change.

refs #6926

Change-Id: I43da3f39957c5832f1ebef32fa18f52adf8c1737

2 years agoUpdateComponentUids creates a map from old uids to new uids 43/243/2
Hannu Niemistö [Mon, 2 Jan 2017 13:48:49 +0000 (15:48 +0200)]
UpdateComponentUids creates a map from old uids to new uids

The map can be used to migrate also some other structures containing
uids.
[PRIVATE-12930]

Change-Id: I9b621eb83a86dcf424b56010249e170cc4bc8741

2 years agoFixed all line endings of the repository 38/238/2
Hannu Niemistö [Thu, 29 Dec 2016 13:21:27 +0000 (15:21 +0200)]
Fixed all line endings of the repository

I followed the instructions in http://stackoverflow.com/a/1511273

git rm --cached -r .
git config core.autocrlf true
git diff --cached --name-only -z | xargs -0 git add
git commit -m "..."

Change-Id: I4920748df8f53c221fc2f643e991b66aea5697e0

2 years agoImproved error handling in shared library import wizard 37/237/2
Tuukka Lehtonen [Thu, 29 Dec 2016 11:05:27 +0000 (13:05 +0200)]
Improved error handling in shared library import wizard

Previously the wizard catched all exceptions in the wrong place causing
the UI to never show any errors to the user and just close the wizard as
if everything was successful. The problems were only printed to the
console and in selected cases also to the workspace error log.

This changes the import code to not catch any exceptions and let the UI
side deal with the thrown exceptions by logging them, showing them to
the user as the wizard's error message and in a separate error dialog.

refs #6903
[PRIVATE-12918]

Change-Id: I5014c86abb61e097b610d7f62e849d1737a4a92b

2 years agoFixed databoard Files.writeFile to not open file twice for writing 36/236/1
Tuukka Lehtonen [Thu, 29 Dec 2016 09:05:07 +0000 (11:05 +0200)]
Fixed databoard Files.writeFile to not open file twice for writing

refs #6902

Change-Id: I543afb745922391f7a9a9ca8150f24cd3092b359

2 years agoProper error message, when pattern compilation fails 35/235/1
Hannu Niemistö [Thu, 29 Dec 2016 07:44:00 +0000 (09:44 +0200)]
Proper error message, when pattern compilation fails

Also, added CHR regression tests to regression test suite.

refs #6900

Change-Id: Idac2dc44b9afa74b5ea48e53d1f317a3497bd2bb

2 years agoAdd EditorAdapterDescriptorImpl.toString implementation for debug 34/234/2
jsimomaa [Wed, 28 Dec 2016 14:06:29 +0000 (16:06 +0200)]
Add EditorAdapterDescriptorImpl.toString implementation for debug

refs #6898

Change-Id: I6754db48ea760777ffdf86b78e384e26bcb9ba66

2 years agoReflectionAdapter2 does not handle all Throwables 33/233/2
jsimomaa [Wed, 28 Dec 2016 14:05:48 +0000 (16:05 +0200)]
ReflectionAdapter2 does not handle all Throwables

ReflectionAdapter2.adapt() does not catch all throwables (e.g.
NoClassDefFoundError) enabling the possibility that the throwable is not
shown to the developer in any manner (console or log)

refs #6898

Change-Id: I32388ebcb23233210c2e54f8530f7e8c626f28de

2 years agoMerge "Ensure GetElementClassRequest is not constructed without elementFactory"
Tuukka Lehtonen [Wed, 28 Dec 2016 14:52:39 +0000 (16:52 +0200)]
Merge "Ensure GetElementClassRequest is not constructed without elementFactory"

2 years agoMerge "Remove unused import in DeleteHandler"
Tuukka Lehtonen [Wed, 28 Dec 2016 14:52:02 +0000 (16:52 +0200)]
Merge "Remove unused import in DeleteHandler"

2 years agoMerge "List the unsatisfied dependencies in CanvasContext"
Jani Simomaa [Wed, 28 Dec 2016 14:17:03 +0000 (16:17 +0200)]
Merge "List the unsatisfied dependencies in CanvasContext"

2 years agoMerge "Adding more detailed message to thrown exceptions in SyncElementFactory"
Jani Simomaa [Wed, 28 Dec 2016 14:16:34 +0000 (16:16 +0200)]
Merge "Adding more detailed message to thrown exceptions in SyncElementFactory"

2 years agoRemove unused import in DeleteHandler 31/231/1
jsimomaa [Wed, 28 Dec 2016 14:01:51 +0000 (16:01 +0200)]
Remove unused import in DeleteHandler

refs #6898

Change-Id: I555641ab201e50e35a17e6e3d3b68d97638f701d

2 years agoList the unsatisfied dependencies in CanvasContext 30/230/1
jsimomaa [Wed, 28 Dec 2016 14:01:24 +0000 (16:01 +0200)]
List the unsatisfied dependencies in CanvasContext

refs #6898

Change-Id: I07de49394e871d27f6df172c02cfdff05cde44b1

2 years agoEnsure GetElementClassRequest is not constructed without elementFactory 32/232/2
jsimomaa [Wed, 28 Dec 2016 14:03:13 +0000 (16:03 +0200)]
Ensure GetElementClassRequest is not constructed without elementFactory

refs #6898

Change-Id: I905188f352bbaeae7787d817e7b0835a36138abf

2 years agoAdding more detailed message to thrown exceptions in SyncElementFactory 29/229/1
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

2 years agoImprovements to SCL compiler error messages 28/228/3
Hannu Niemistö [Wed, 28 Dec 2016 10:46:48 +0000 (12:46 +0200)]
Improvements to SCL compiler error messages

Better error message if type annotation has different number of
parameters than the function definition.

Refactored method names, we have now getSyntacticFunctionArity for
estimating function arity without type information and
getFunctionDefinitionPatternArity for arity calculations of patterns.

refs #6897

Change-Id: I032ee0e5da416f232517d1e03c7a7cb0208c4d45

2 years agoReverted if-without-else feature in SCL 27/227/1
Hannu Niemistö [Tue, 27 Dec 2016 14:30:02 +0000 (16:30 +0200)]
Reverted if-without-else feature in SCL

Removed possibility to have if-then -construct without else, because the
implementation changed parsing rules and some existing code was broken.
The feature might be added in future, if better implementation is found.

refs #6894
related to change (refs #6888)

Change-Id: I1c729c4176cfaf867ba3dbf13fd73fbc14f41e61

2 years agoFixing a deadlock. Some improvements to ModuleSourceRepository API 26/226/2
Hannu Niemistö [Fri, 23 Dec 2016 14:09:58 +0000 (16:09 +0200)]
Fixing a deadlock. Some improvements to ModuleSourceRepository API

refs #6851

Change-Id: I4328ab825ae1bb9f9ab529c947f6b02a8d90be83

2 years agoSet default database driver to acorn. 25/225/2
Tuukka Lehtonen [Fri, 23 Dec 2016 07:56:57 +0000 (09:56 +0200)]
Set default database driver to acorn.

This change was made possible by change
I844171225284cb7a9d28b6ab5f00c4db88e2afa0.

refs #6887

Change-Id: Ib61f88b8759be4aec1f65887ca17847dc4e5201f

2 years agoMerge "Re-enabled Acorn transaction cancellation support for testing"
Tuukka Lehtonen [Fri, 23 Dec 2016 07:51:30 +0000 (09:51 +0200)]
Merge "Re-enabled Acorn transaction cancellation support for testing"

2 years agoRe-enabled Acorn transaction cancellation support for testing 17/217/2
Antti Villberg [Tue, 20 Dec 2016 05:07:06 +0000 (07:07 +0200)]
Re-enabled Acorn transaction cancellation support for testing

refs #6887

Change-Id: I844171225284cb7a9d28b6ab5f00c4db88e2afa0

2 years agoRemoved unnecessary external jar procyon-decompiler 24/224/1
Hannu Niemistö [Tue, 20 Dec 2016 14:26:35 +0000 (16:26 +0200)]
Removed unnecessary external jar procyon-decompiler

Change-Id: I84d92daf56f5dbbec67d412c4548b3a98462e939

2 years agoMerge changes Ib86a41bb,I4fed12d3
Tuukka Lehtonen [Tue, 20 Dec 2016 12:41:08 +0000 (14:41 +0200)]
Merge changes Ib86a41bb,I4fed12d3

* changes:
  Show modelled STS tests in model browser in execution order
  Run modelled STS tests in alphanumeric order

2 years agoMerged changes from feature/scl to master. 21/221/6
Hannu Niemistö [Tue, 20 Dec 2016 10:09:30 +0000 (12:09 +0200)]
Merged changes from feature/scl to master.

This commit contains lots of SCL compiler and runtime changes:
* New CHR-rule based sublanguage. This change alters meaning of
when-keyword and so some code using when may break.
* Removed type classes Eq and Hashable. Compiler now generates and uses
Java methods equals and hashCode. This change is needed for better
interoperability with Java code.
* Type based overloading for symbols imported from different modules
* Some expressions ignore their return value (statements in
do/let/where, if and match cases if the return value of if/match is
ignored). These expressions can have any type and if/match expression
branches may have different types. Also if-expressions may have only
else branch. If the return value of apply-experssion is ignored, the
expression cannot be partial application that does not have
side-effects.
* View pattern support
(https://ghc.haskell.org/trac/ghc/wiki/ViewPatterns)
* Lambda-match support
(https://ghc.haskell.org/trac/ghc/wiki/LambdasVsPatternMatching)
* String interpolation can be used also in patterns
* SCL compiler regression test suite has been moved to a new bundle
org.simantics.scl.compiler.tests
* Improvements to SCL module editor syntax coloring
* SCL compiler refactorings, for example all name constants are now in a
dedicated class Names and CompilationContext merging old context classes
* Improved byte code for comparisons
* Improved code generation from string interpolation
* Anonymous object support in SCL backend (not yet frontend support)
* Bugfixes and new regression tests

refs #6888

Change-Id: I9d4c001d0323069d3b86a83369fa3581f02ee305

2 years agoShow modelled STS tests in model browser in execution order 23/223/1
Jussi Koskela [Tue, 20 Dec 2016 12:13:57 +0000 (14:13 +0200)]
Show modelled STS tests in model browser in execution order

refs #6890
Change-Id: Ib86a41bb738cf9fab476ce062811deeeccc3f317

2 years agoRun modelled STS tests in alphanumeric order 22/222/1
Jussi Koskela [Tue, 20 Dec 2016 10:07:41 +0000 (12:07 +0200)]
Run modelled STS tests in alphanumeric order

Run modelled STS tests in alphanumeric order in case of equal execution
priority

refs #6889
Change-Id: I4fed12d34de943ea9f950d209754c9465b2ce9b4

2 years agoAdded info on backup location to documentation backup.
Tuukka Lehtonen [Tue, 20 Dec 2016 08:51:27 +0000 (10:51 +0200)]
Added info on backup location to documentation backup.

refs #6848
refs #6881

2 years agoMerge "Bump master versions from 1.25.0 to 1.26.0."
Tuukka Lehtonen [Tue, 20 Dec 2016 06:16:54 +0000 (08:16 +0200)]
Merge "Bump master versions from 1.25.0 to 1.26.0."

2 years agoImport/export menuitems missing from Simantics Desktop product 15/215/2
Jussi Koskela [Mon, 19 Dec 2016 15:24:01 +0000 (17:24 +0200)]
Import/export menuitems missing from Simantics Desktop product

Import/export were moved to separate feature
(org.simantics.modeling.ui.workbench.feature) in #6856, but this feature
was not included to Simantics Desktop product.

refs #6885
Change-Id: Ibfecb1974c15387298661842f133ecb7f5984355

2 years agoFixing modelled STS tests to not include nested JUnit suites 14/214/1
jsimomaa [Mon, 19 Dec 2016 15:03:40 +0000 (17:03 +0200)]
Fixing modelled STS tests to not include nested JUnit suites

refs #6884

Change-Id: Ia86e62bae10e6ef12922e168231917bda40fc002

2 years agoFixing modelled STS tests to not include nested JUnit suites 13/213/1
jsimomaa [Mon, 19 Dec 2016 14:48:34 +0000 (16:48 +0200)]
Fixing modelled STS tests to not include nested JUnit suites

refs #6884

Change-Id: I314f591d33bb06504f875b14041f12edc4dedb71

2 years agoAdded release schedule and produced artifact documentation
Tuukka Lehtonen [Mon, 19 Dec 2016 14:05:01 +0000 (16:05 +0200)]
Added release schedule and produced artifact documentation

Also removed the -semantum.target file since
it is not really useful anymore.

refs #6881

2 years agoBump master versions from 1.25.0 to 1.26.0. 10/210/2
Tuukka Lehtonen [Mon, 19 Dec 2016 07:17:56 +0000 (09:17 +0200)]
Bump master versions from 1.25.0 to 1.26.0.

refs #6879

Change-Id: I3bdfa773562033d3dcc1d72a359cf61d7f35dfee

2 years agoFix desktop product configuration 11/211/1
Tuukka Lehtonen [Mon, 19 Dec 2016 07:55:48 +0000 (09:55 +0200)]
Fix desktop product configuration

Removed -Djava.net.preferIPv4Stack=true which is totally out of date. It
was an early day procore hack.

Added -Djava.util.Arrays.useLegacyMergeSort=true because the G2D scene
graph comparator for some still unknown reason runs into problems with
Java's TimSort implementation.

refs #6621

Change-Id: If931e8bfe60525015166813ac479f0aadeac8f90

2 years agoFixed documentation dumping scripts.
Tuukka Lehtonen [Sun, 18 Dec 2016 22:37:50 +0000 (00:37 +0200)]
Fixed documentation dumping scripts.

Dumped documentation is not stored in the repository, it would just bloat it.

refs #6848

2 years agoFixed release engineering target platform preparation instructions 09/209/1
Tuukka Lehtonen [Sun, 18 Dec 2016 22:26:54 +0000 (00:26 +0200)]
Fixed release engineering target platform preparation instructions

refs #6621
refs #6848

Change-Id: I4d4b0b62ac1e87a841c6f9807d60ed3998fd2ede

2 years agoInclude SDK source in simantics.target 06/206/1
Tuukka Lehtonen [Sun, 18 Dec 2016 19:57:08 +0000 (21:57 +0200)]
Include SDK source in simantics.target

refs #6621

Change-Id: Ic8748eaeff962c5a21e660791c6c034c561b81f1

2 years agoInclude source features in generated SDK P2 repository 05/205/1
Tuukka Lehtonen [Sun, 18 Dec 2016 19:25:07 +0000 (21:25 +0200)]
Include source features in generated SDK P2 repository

The problem was that the generated org.simantics.sdk.source feature was
missing from org.simantics.sdk.repository/category.xml and thus the
build would not include any sources.

Also bumped used tycho version to 0.26.0 from 0.25.0.

refs #6621

Change-Id: I10e63a77b414f67bb32168d93d0c612ac1bc0b56

2 years agoInitial draft of Simantics release engineering instructions 04/204/2
Tuukka Lehtonen [Sun, 18 Dec 2016 17:31:21 +0000 (19:31 +0200)]
Initial draft of Simantics release engineering instructions

refs #6621
refs #6848

Change-Id: Id726c100944fd4f1df7c54d9a2eed16a2ca88e6c

2 years agoTarget platform release work for 1.25.0. 03/203/1
Tuukka Lehtonen [Sun, 18 Dec 2016 15:53:43 +0000 (17:53 +0200)]
Target platform release work for 1.25.0.

Removed useless releng/org.simantics.target.
Moved releng/org.simantics.target/simantics.target to
org.simantics.sdk.build.targetdefinition/simantics.target and changed
its contents to match what shall be published on the web as
http://www.simantics.org/download/<refspec>/simantics.target.

refs #6621

Change-Id: I8e430cc9a724dd992f88abe8328606672f0de29f

2 years agoMerge "Set tycho-packaging-plugin qualifier format to 'v'yyyyMMdd-HHmmss"
Tuukka Lehtonen [Thu, 15 Dec 2016 12:44:35 +0000 (14:44 +0200)]
Merge "Set tycho-packaging-plugin qualifier format to 'v'yyyyMMdd-HHmmss"

2 years agoSet tycho-packaging-plugin qualifier format to 'v'yyyyMMdd-HHmmss 02/202/1
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

2 years agoDocument server should use variable value request with binding 01/201/2
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

2 years agoAdd VariableValueWithBinding request into db.layer0 00/200/3
Antti Villberg [Wed, 14 Dec 2016 06:07:24 +0000 (08:07 +0200)]
Add VariableValueWithBinding request into db.layer0

refs #6875

Change-Id: If71e9d082473bfcf54314e376a39d610df05c987

2 years agoAn attempt to resolve this issue for good 97/197/1
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

2 years agoMerge "ValueConversion.parsePrimitive consumes NumberFormatException silently"
Hannu Niemistö [Mon, 12 Dec 2016 09:05:07 +0000 (11:05 +0200)]
Merge "ValueConversion.parsePrimitive consumes NumberFormatException silently"

2 years agoMerge "Moved File menu Export and Import contributions to separate feature. "
Tuukka Lehtonen [Mon, 12 Dec 2016 07:45:04 +0000 (09:45 +0200)]
Merge "Moved File menu Export and Import contributions to separate feature. "

2 years agoMoved File menu Export and Import contributions to separate feature. 91/191/6
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

2 years agoSupport for console discovery 96/196/2
Antti Villberg [Sun, 11 Dec 2016 18:22:16 +0000 (20:22 +0200)]
Support for console discovery

refs #6864

Change-Id: I9a7b7bceffab1bd1a501d32c295c6da81c52aafc

3 years agoValueConversion.parsePrimitive consumes NumberFormatException silently 95/195/1
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

3 years agoFixed labels for search results restored from previous search memento 94/194/2
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

3 years agoRemoved obsolete structural browser. 92/192/7
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

3 years agoRe-enabled CTRL+SHIFT+R resource search dialog in org.simantics.debug.ui 90/190/3
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

3 years agoAdded ResourceWorkbenchSelectionElement 89/189/2
Antti Villberg [Wed, 7 Dec 2016 13:43:02 +0000 (15:43 +0200)]
Added ResourceWorkbenchSelectionElement

refs #6853

Change-Id: I878cc7d463ae30090ba55a886e59d7ed2c4fd647

3 years agoMerge commit '876ede6'
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

3 years agoSync git svn branch with SVN repository r33406. svn
Tuukka Lehtonen [Tue, 6 Dec 2016 12:30:40 +0000 (14:30 +0200)]
Sync git svn branch with SVN repository r33406.

3 years agoRouteGraph related methods are now public for code reuse 88/188/1
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

3 years agoRemoved useless TODO comment from TrendNode. 87/187/2
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

3 years agoAdded support for JSON PlainTextTransferable to charts and subscriptions 86/186/2
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

3 years agoFixed regression in TrendNode. 85/185/3
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

3 years agoFixed bounds calculation for flags and diagram profile monitors. 83/183/2
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

3 years agoInclude org.apache.batik/1.8.0 in org.simantics.g2d feature. 82/182/1
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

3 years agoMerge "Remove deprecated SIMANTICS-README.mediawiki."
Tuukka Lehtonen [Mon, 28 Nov 2016 12:59:06 +0000 (14:59 +0200)]
Merge "Remove deprecated SIMANTICS-README.mediawiki."

3 years agoRemove deprecated SIMANTICS-README.mediawiki. 81/181/1
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

3 years agoUCs can have their own SCLModule definitions 78/178/3
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

3 years agoRe-export org.simantics.db.management dependency from org.simantics. 77/177/2
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

3 years agoMerge "Introduce utility class org.simantics.db.function.DbOptional<T>."
Tuukka Lehtonen [Fri, 25 Nov 2016 14:44:01 +0000 (16:44 +0200)]
Merge "Introduce utility class org.simantics.db.function.DbOptional<T>."

3 years agoInclude jackson-core in org.simantics.scl feature. 75/175/2
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

3 years agoIntroduce utility class org.simantics.db.function.DbOptional<T>. 70/170/2
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

3 years agoAdded jackson dependency to org.simantics.scl.data for Data/Json 72/172/2
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

3 years agoInclude Jackson XML/CSV dataformat libraries in external components 73/173/2
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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

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

refs #6812

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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