]> gerrit.simantics Code Review - simantics/interop.git/log
simantics/interop.git
5 years agoFix ResourceComparator initialization 18/3618/1 release/1.41.0
Marko Luukkainen [Tue, 26 Nov 2019 10:50:35 +0000 (12:50 +0200)]
Fix ResourceComparator initialization

gitlab #16

Change-Id: I09c32c66b4e15aaed42dac03f82502c3f723131e

5 years agoResourceComparator initialization method 17/3617/1
Marko Luukkainen [Mon, 25 Nov 2019 12:36:34 +0000 (14:36 +0200)]
ResourceComparator initialization method

gitlab #16

Change-Id: I11df4cd5e5ae0f81f3ad929fe6944883b7ed4670

5 years agoUpdateOp specific selection propagation 03/3603/1
Marko Luukkainen [Fri, 22 Nov 2019 11:35:38 +0000 (13:35 +0200)]
UpdateOp specific selection propagation

This implementation replaces previous, direction (parent/sub) specific
propagation.

This is API change, implementations must be updated.

gitlab #16

Change-Id: I1da59958636495ee2e9c90cc6b86ce0cfb99c186

5 years agoAdded enabled flag for UpdateOp 98/3598/1
Marko Luukkainen [Thu, 21 Nov 2019 12:30:32 +0000 (14:30 +0200)]
Added enabled flag for UpdateOp

gitlab #16

Change-Id: I4f8e0146c15a30a0ad00650600f5275c0df05717

5 years agoAdd post processing step to bind property and structural changes 87/3587/1
Marko Luukkainen [Wed, 20 Nov 2019 17:30:15 +0000 (19:30 +0200)]
Add post processing step to bind property and structural changes

Additionally added enabled flag for PropertyChanges

gitlab #16

Change-Id: I7ac9c999471ab934cc26bd36d920940cb91cb528

5 years agoSupport for UpdateOps that are not adds or deletes. 81/3581/1
Marko Luukkainen [Wed, 20 Nov 2019 13:00:57 +0000 (15:00 +0200)]
Support for UpdateOps that are not adds or deletes.

gitlab #16

Change-Id: Idac97fbf7bb86c320fca3b242116f62e4f687228

5 years agoProperty changes may incude data type changes. 64/3564/1
Marko Luukkainen [Tue, 19 Nov 2019 09:35:01 +0000 (11:35 +0200)]
Property changes may incude data type changes.

gitlab #15

Change-Id: Iddcfd403cda7035bb8512687354666be4c269e93

5 years agoImprove matching logic for three way UpdateTree nodes. 39/3339/1
Marko Luukkainen [Wed, 16 Oct 2019 09:54:29 +0000 (12:54 +0300)]
Improve matching logic for three way UpdateTree nodes.

gitlab #14

Change-Id: I87e14b14d548113c084882dd7e82939495aff92a

5 years agoFix register and clear functions to have correct amount of arguments 78/3278/1
Marko Luukkainen [Wed, 25 Sep 2019 06:48:34 +0000 (09:48 +0300)]
Fix register and clear functions to have correct amount of arguments

gitlab #13

Change-Id: I315c513bc8e4ead8b9afdbd8b6e3d6f96682015c

5 years agoInclude interop.scl in P2 repository 69/3269/1
Marko Luukkainen [Thu, 19 Sep 2019 14:44:30 +0000 (17:44 +0300)]
Include interop.scl in P2 repository

gitlab #13

Change-Id: I226b7c37ad93ea1e19d759b6cf2dcbf11d948639

5 years agoClear for single functions + include interop.scl in the build 68/3268/1
Marko Luukkainen [Thu, 19 Sep 2019 14:29:37 +0000 (17:29 +0300)]
Clear for single functions + include interop.scl in the build

gilab #13

Change-Id: I2b1e0e1b3c4c41b902e5e95cc667651275d9e200

5 years agoSCL Function registry for emulating listeners 63/3263/1
Marko Luukkainen [Tue, 17 Sep 2019 13:34:48 +0000 (16:34 +0300)]
SCL Function registry for emulating listeners

gitlab #13

Change-Id: I1c370495412d47cbd27a1cfe06d508a5fa645256

5 years agoAdded new interface for user filters 50/3250/1
Marko Luukkainen [Thu, 12 Sep 2019 16:07:08 +0000 (19:07 +0300)]
Added new interface for user filters

ChangeFilter2 operates on change management objects, instead of raw
change data.

gitlab #12

Change-Id: I54f1bbc62b8715a3582ee71ecc802cdb315f0b3d

5 years agoUse ArrayList (instead of HashSet) to store changes 67/3167/1
Marko Luukkainen [Thu, 29 Aug 2019 07:46:08 +0000 (10:46 +0300)]
Use ArrayList (instead of HashSet) to store changes

gitlab #11

Change-Id: I7d5a2c1f462c6de3c401288420350e25f650147f

5 years agoAdded getPredicate() for Modification class 48/3148/2
Marko Luukkainen [Fri, 23 Aug 2019 12:49:10 +0000 (15:49 +0300)]
Added getPredicate() for Modification class

Left or right side statement can be null, but predicate is expected to
be the same on both statements.

gitlab #10

Change-Id: Idce23d4bc54ae19876bb444a5dd10b2af9661c04

5 years agoHandle asserted property statements 74/2874/1 release/1.39.0
Marko Luukkainen [Fri, 3 May 2019 10:41:51 +0000 (13:41 +0300)]
Handle asserted property statements

Added GraphComparator.Modification object for property changes
Store subject Resources to PropertyChanges objects
Use Java 1.8

gitlab #10

Change-Id: Ieb04c620c2be8e8d206d59f70f09ec2d62aea5f4

5 years agoMerge "Fix NPE in TypeComparator" release/1.38.0
Marko Luukkainen [Fri, 29 Mar 2019 10:48:07 +0000 (10:48 +0000)]
Merge "Fix NPE in TypeComparator"

5 years agoFix NPE in TypeComparator 22/2822/1
Marko Luukkainen [Thu, 28 Mar 2019 17:32:48 +0000 (19:32 +0200)]
Fix NPE in TypeComparator

Additional change: debug print for found Resource matches

refs #9

Change-Id: I5c44a4a9696df03d4676ad30b272bc71c7029545

5 years agoMerge "Remove outdated model browser contribution"
Marko Luukkainen [Tue, 12 Mar 2019 17:00:49 +0000 (17:00 +0000)]
Merge "Remove outdated model browser contribution"

5 years agoMerge "Java API for diagrams, work in progress"
Marko Luukkainen [Tue, 12 Mar 2019 16:59:41 +0000 (16:59 +0000)]
Merge "Java API for diagrams, work in progress"

5 years agoRemove outdated model browser contribution 70/2770/3
Marko Luukkainen [Tue, 12 Mar 2019 16:50:34 +0000 (18:50 +0200)]
Remove outdated model browser contribution

gitlab #8

Change-Id: Id331f99445265f02fd769a30c777aaf04a94747c

5 years agoJava API for diagrams, work in progress 69/2769/1
Marko Luukkainen [Tue, 12 Mar 2019 16:48:36 +0000 (18:48 +0200)]
Java API for diagrams, work in progress

gitlab #7

Change-Id: I05295206618511bd3d55589fd588fa1079f042e2

5 years agoMerge "Attribute namespace handling overrides."
Marko Luukkainen [Mon, 4 Feb 2019 14:19:30 +0000 (14:19 +0000)]
Merge "Attribute namespace handling overrides."

5 years agoAttribute namespace handling overrides. 42/2642/1
Marko Luukkainen [Mon, 4 Feb 2019 14:16:25 +0000 (16:16 +0200)]
Attribute namespace handling overrides.

gitlab #3

Change-Id: I1968b61f24a3227a3a3634580fa63e3123b2c2c0

5 years agoAdd gitignore that ignores vaadin preferences 98/2598/1 release/1.37.0
Miro Richard Eklund [Fri, 18 Jan 2019 10:43:57 +0000 (12:43 +0200)]
Add gitignore that ignores vaadin preferences

gitlab #6
closes #6

Change-Id: I9d79e90b768f94da267449bc6194a210c8a6afb0

6 years agoImproved attribute namespace handling + element characters data parsing 47/2347/1 private/psaas release/1.36.0
Marko Luukkainen [Mon, 22 Oct 2018 09:19:25 +0000 (12:19 +0300)]
Improved attribute namespace handling + element characters data parsing

gitlab #3

Change-Id: Ia5a27bfb304b863b9e8ba30a968fd3558fd5d8b6

6 years agoAttribute namespace + multi-schema data export 77/2277/2
Marko Luukkainen [Fri, 5 Oct 2018 15:22:55 +0000 (18:22 +0300)]
Attribute namespace + multi-schema data export

gitlab #3

Change-Id: I7eb6cdae8be3be31301a0c4a2b5e59365c4d7293

6 years agoGenerate SCL bindings for multi-version ontology references classes. 67/2167/1
Marko Luukkainen [Thu, 13 Sep 2018 10:26:37 +0000 (13:26 +0300)]
Generate SCL bindings for multi-version ontology references classes.

* Additionally, added SCL bindings to XML time/date data types

gitlab #5

Change-Id: Ia1b5786becf99b691a66d48b63bd2689cb646d9a

6 years agoImproved processing of multiple XML data files. 60/2160/2
Marko Luukkainen [Tue, 11 Sep 2018 10:47:34 +0000 (13:47 +0300)]
Improved processing of multiple XML data files.

gitlab #3

Change-Id: Ice8db7eb7df11880f81850d7f1a714e8738ef945

6 years agoHandle multi-namespace XML files. 26/2126/2
Marko Luukkainen [Thu, 6 Sep 2018 10:42:52 +0000 (13:42 +0300)]
Handle multi-namespace XML files.

gitlab #3

Change-Id: I7b067e47a415116b127ecd707b54090c8d277446

6 years agoRemove usage of deprecated SimanticsUI-methods 58/2058/1
Tuukka Lehtonen [Thu, 30 Aug 2018 12:05:41 +0000 (15:05 +0300)]
Remove usage of deprecated SimanticsUI-methods

gitlab #4
gitlab simantics/platform#95

Change-Id: I71a99f04b3db073268ad508c46841350574e077a

6 years agoXML data based schema and ontology generation 26/2026/1
Marko Luukkainen [Fri, 24 Aug 2018 09:45:10 +0000 (12:45 +0300)]
XML data based schema and ontology generation

gitlab #3

Change-Id: Ibc1821ede1bafb1aa9b68b32aff2f57faffa5a1f

6 years agoFix possible NPE when handling added and removed properties 00/2000/1
Marko Luukkainen [Mon, 13 Aug 2018 07:27:53 +0000 (10:27 +0300)]
Fix possible NPE when handling added and removed properties

gitlab #2

Change-Id: Iea39d4965096726162cc085a872c411e7433fa4b

6 years agoAdded LICENSE
Tuukka Lehtonen [Thu, 14 Jun 2018 11:44:49 +0000 (14:44 +0300)]
Added LICENSE

6 years agoMerge "Previous changes broke Apros specific code, heres a fix." release/1.34.0 release/1.34.1 release/1.34.2
Marko Luukkainen [Thu, 31 May 2018 08:57:03 +0000 (08:57 +0000)]
Merge "Previous changes broke Apros specific code, heres a fix."

6 years agoMerge "Minor adjustments"
Marko Luukkainen [Thu, 31 May 2018 08:56:55 +0000 (08:56 +0000)]
Merge "Minor adjustments"

6 years agoPrevious changes broke Apros specific code, heres a fix. 12/1812/1
Marko Luukkainen [Thu, 31 May 2018 08:52:52 +0000 (11:52 +0300)]
Previous changes broke Apros specific code, heres a fix.

gitlab #1

Change-Id: I4fcbb926dd4c116ca9d27010353668936cc835c2

6 years agoMinor adjustments 11/1811/1
Marko Luukkainen [Wed, 30 May 2018 14:25:16 +0000 (17:25 +0300)]
Minor adjustments

Allowing code re-use by making things public
Fix for property change matching (for filtering)

gitlab #1

Change-Id: I40a1493ee7777f4e1ffbc820ca642878ae5b19ab

6 years agoMerge "Added support for filtering changes"
Marko Luukkainen [Tue, 29 May 2018 13:59:57 +0000 (13:59 +0000)]
Merge "Added support for filtering changes"

6 years agoAdded support for filtering changes 10/1810/1
Marko Luukkainen [Tue, 29 May 2018 13:44:48 +0000 (16:44 +0300)]
Added support for filtering changes

gitlab #1

Change-Id: I765d0bdad5c304321bd3c82e77c386da890eb02e

6 years agoFixing compiler warning & testing gerrit -> gitlab replication 39/1739/1
jsimomaa [Tue, 8 May 2018 13:10:08 +0000 (16:10 +0300)]
Fixing compiler warning & testing gerrit -> gitlab replication

refs #xxxx

Change-Id: Icccba292397d9798ab0ea03b238daec53a2049e1

6 years agoMoved label generation to separate init() method
Marko Luukkainen [Tue, 6 Mar 2018 12:46:29 +0000 (14:46 +0200)]
Moved label generation to separate init() method

Change-Id: I19de25135578ffa826c46c940191b6e0337bc3c6

6 years agoUsing bindings when comparing literal values (perf optimization)
Marko Luukkainen [Wed, 28 Feb 2018 11:14:29 +0000 (13:14 +0200)]
Using bindings when comparing literal values (perf optimization)

6 years agoFixing Logger fallout caused by platform commit 1dfeb7d5 94/1394/1 release/1.33.0
Tuukka Lehtonen [Mon, 22 Jan 2018 11:06:12 +0000 (13:06 +0200)]
Fixing Logger fallout caused by platform commit 1dfeb7d5

refs #7719

Change-Id: I493f7330f826208446410e66b9eb7a0f34709da0

6 years agoSwitch to delayed write for more performance. 57/1357/3 release/1.32.0 release/1.32.0.1 release/1.32.0.2 release/1.32.1
Antti Villberg [Mon, 8 Jan 2018 06:23:52 +0000 (08:23 +0200)]
Switch to delayed write for more performance.

refs #7656

Change-Id: Iaf7e364bdbb286ca4761f6dc7b78efcb54560e33

7 years agoDon't continue parsing XML file if root element is not recognised
Marko Luukkainen [Thu, 21 Dec 2017 10:42:03 +0000 (12:42 +0200)]
Don't continue parsing XML file if root element is not recognised

7 years agoAdding builtin type for Class in SCL so fix Update.scl 19/1319/1
jsimomaa [Thu, 14 Dec 2017 06:12:31 +0000 (08:12 +0200)]
Adding builtin type for Class in SCL so fix Update.scl

refs #7681

Change-Id: Id4f648a50e4c53b429e0ce0d67017e87f0baa2b4

7 years agoAdd Maybe for SCL functions that can return null. release/1.31.0 v1.31.0
Marko Luukkainen [Wed, 22 Nov 2017 16:22:09 +0000 (18:22 +0200)]
Add Maybe for SCL functions that can return null.

7 years agoAdd SCL-folder to build.properties for binary builds 39/1239/1
jsimomaa [Sun, 19 Nov 2017 19:00:31 +0000 (21:00 +0200)]
Add SCL-folder to build.properties for binary builds

Change-Id: I38c53ff4f6b7b56d712244a17412399e82e9a3fc

7 years agoUpdateNode / UpdateOp may have a Resource
Marko Luukkainen [Wed, 1 Nov 2017 13:55:54 +0000 (15:55 +0200)]
UpdateNode / UpdateOp may have a Resource

7 years agoPropertyChange class (instead of Pair)
Marko Luukkainen [Tue, 24 Oct 2017 14:26:17 +0000 (17:26 +0300)]
PropertyChange class (instead of Pair)

7 years agoAbility to reset the default selections
Marko Luukkainen [Tue, 24 Oct 2017 08:16:33 +0000 (11:16 +0300)]
Ability to reset the default selections

7 years agoDefault property selection was using a wrong resource for comparison
Marko Luukkainen [Mon, 23 Oct 2017 10:56:10 +0000 (13:56 +0300)]
Default property selection was using a wrong resource for comparison

7 years agoThree-way comparison
Marko Luukkainen [Fri, 20 Oct 2017 12:29:08 +0000 (15:29 +0300)]
Three-way comparison

7 years agoRetrieving UpdateNodes with a Resource reference
Marko Luukkainen [Tue, 17 Oct 2017 10:37:42 +0000 (13:37 +0300)]
Retrieving UpdateNodes with a Resource reference

7 years agoSCL bindings for model update
Marko Luukkainen [Thu, 12 Oct 2017 15:02:36 +0000 (18:02 +0300)]
SCL bindings for model update

7 years agoSeparating model update logic from UI
Marko Luukkainen [Tue, 3 Oct 2017 15:04:28 +0000 (18:04 +0300)]
Separating model update logic from UI

7 years agoAdded interop.update to interop feature 44/1044/1
Hannu Niemistö [Wed, 27 Sep 2017 11:08:10 +0000 (14:08 +0300)]
Added interop.update to interop feature

Change-Id: I80d79177dbc9b6cd5a182d4c4eaac1d6646689ce

7 years agoGraphviz only as dependency of interop feature, not included 42/1042/2
Tuukka Lehtonen [Wed, 27 Sep 2017 09:32:44 +0000 (12:32 +0300)]
Graphviz only as dependency of interop feature, not included

refs #7396

Change-Id: I0e37da3e4a6403a149ee3b9a4027e17bc4412939

7 years agoAdded org.simantics.excel.poi.feature
Tuukka Lehtonen [Wed, 27 Sep 2017 07:29:01 +0000 (10:29 +0300)]
Added org.simantics.excel.poi.feature

The new feature is now also a part of
org.simantics.interop.repository.

refs #7396

7 years agoTychoized Simantics interop repository
Tuukka Lehtonen [Wed, 27 Sep 2017 06:38:05 +0000 (09:38 +0300)]
Tychoized Simantics interop repository

The repository built for org.simantics.interop.repository now
contains two features, org.simantics.interop.feature and the
newly added org.simantics.xml.sax.feature.

org.simantics.excel.poi is not a part of any feature yet.

refs #7396

7 years agoBug fix to importer and exporter generation for simpleType top level 59/659/1
Reino Ruusu [Wed, 28 Jun 2017 15:03:14 +0000 (18:03 +0300)]
Bug fix to importer and exporter generation for simpleType top level
elements.

Change-Id: I4f8df343ddfcf9c19e24d4d8563be64b3103fa54

7 years agoAdd ComplexTpye inheritance to SimpleType or literal type when necessary
Marko Luukkainen [Tue, 9 May 2017 07:19:38 +0000 (10:19 +0300)]
Add ComplexTpye inheritance to SimpleType or literal type when necessary

Change-Id: I112f7277b34ce770e63fbd0bdb2bb0d417780f00

7 years agoSchema conversion changes
Marko Luukkainen [Thu, 4 May 2017 10:28:35 +0000 (13:28 +0300)]
Schema conversion changes

Multiline base64 data import fixed
Use '_List' postfix with LinkedList
Processing a SimpleType when schema contains an Element with the same
name failed

Change-Id: I76607517d2e60dc87c0fc6e07c7b81b65e6d4d8a

7 years agoSeveral updates to interoperability. 63/463/2
Reino Ruusu [Tue, 25 Apr 2017 20:28:26 +0000 (23:28 +0300)]
Several updates to interoperability.

Declaration of simpleTypes as literal types.
Support for value elements with simple datatypes.
Fixed Base64 support.
Improved support for choice indicators.
Fixes for schemas without target namespace.
Generation of empty string literals for empty elements.

Change-Id: I8ae3b4fa47690c7c58df5a44eaf3191cc13f1fa2

7 years agoImprove graph comparison logic
Marko Luukkainen [Thu, 13 Apr 2017 07:34:54 +0000 (10:34 +0300)]
Improve graph comparison logic

Added additional processing step for Resources that cannot be identified
when they are encountered the first time

refs #7045

Change-Id: I4cdefb7ae765f2f8efe5ab7d2cf444d8e98d7185

7 years agoFix introduced ConcurrentModficationException
Marko Luukkainen [Thu, 6 Apr 2017 15:02:33 +0000 (18:02 +0300)]
Fix introduced ConcurrentModficationException

refs #7045

Change-Id: Ib93731f246193505ec1bddc4e38928312b11981d

7 years agoThree-way comparison: utilise old changes in the update step
Marko Luukkainen [Thu, 6 Apr 2017 10:53:06 +0000 (13:53 +0300)]
Three-way comparison: utilise old changes in the update step

refs #7045

Change-Id: Icb060716503992e2dbb69b779952f397e6df9169

7 years agoInitial implementation of model updates with three-way comparison.
Marko Luukkainen [Mon, 3 Apr 2017 15:40:02 +0000 (18:40 +0300)]
Initial implementation of model updates with three-way comparison.

refs #7045

Change-Id: Ie6365fd4c5a7f8e93f5cb96b3cadc5b986213c14

7 years agoAdd third Resource reference to UpdateEditorInput for three-way
Marko Luukkainen [Mon, 3 Apr 2017 14:02:00 +0000 (17:02 +0300)]
Add third Resource reference to UpdateEditorInput for three-way
comparison support.

refs #7045

Change-Id: I3137324f7ce6c2d9981d2a148167c0e1e8cfaebf

7 years agoStore Property change selections to UpdateList
Marko Luukkainen [Mon, 3 Apr 2017 12:04:17 +0000 (15:04 +0300)]
Store Property change selections to UpdateList

refs #7045

Change-Id: If505e8452f4d424cadf281be5e5190b60db46d99

7 years agoUpdateList object for property changes
Marko Luukkainen [Thu, 30 Mar 2017 14:12:04 +0000 (17:12 +0300)]
UpdateList object for property changes

refs #7045

Change-Id: Ic1f86ee82e8fd214f8fd29ff00fb828bbf956ab1

7 years agoCreate UpdateNode labels in the constructor.
Marko Luukkainen [Thu, 30 Mar 2017 08:05:00 +0000 (11:05 +0300)]
Create UpdateNode labels in the constructor.

refs #7045

Change-Id: Ic173aeb933cff44d40f746af707804b91c57259b

7 years agoSeparate ModelUpdateEditor's ViewPart and the implementation
Marko Luukkainen [Tue, 28 Mar 2017 08:22:21 +0000 (11:22 +0300)]
Separate ModelUpdateEditor's ViewPart and the implementation

refs #7045

Change-Id: I1efe963f88a10ffe4e5f4b60da09126ff6f9f30e

7 years agoDependency analysis for XML-schemas consisting of multiple files
Marko Luukkainen [Mon, 20 Mar 2017 12:52:48 +0000 (14:52 +0200)]
Dependency analysis for XML-schemas consisting of multiple files

refs #6985

Change-Id: I4462e565f49233faee581bdbfe2529bc158255a7

7 years agoFix plug-in dependencies + use fastutils hashmaps.
Marko Luukkainen [Mon, 13 Mar 2017 10:56:09 +0000 (12:56 +0200)]
Fix plug-in dependencies + use fastutils hashmaps.

fixes #7086

Change-Id: I74282dd545ce42f9d44484b119f92a3fe3f03103

7 years agoAllow existing nodes to contain No-operation update for dependency
Marko Luukkainen [Fri, 3 Mar 2017 12:32:53 +0000 (14:32 +0200)]
Allow existing nodes to contain No-operation update for dependency
evaluation

refs #7045

Change-Id: I5589a337d5ba1f16ad201921a00a675330acc6d0

7 years agoAllow binding statement changes to update operations
Marko Luukkainen [Fri, 3 Mar 2017 11:17:31 +0000 (13:17 +0200)]
Allow binding statement changes to update operations

refs #7045

Change-Id: I36cff7c0451cc19934f176ab6db4d30b41636cd4

7 years agoRefactoring update dependency tree calculation
Marko Luukkainen [Fri, 24 Feb 2017 11:15:04 +0000 (13:15 +0200)]
Refactoring update dependency tree calculation

refs #7045

Change-Id: If298ffbcc83520c12683252ca9eaa4243e3addd3

7 years agoGenerinc UpdateEditor
Marko Luukkainen [Thu, 23 Feb 2017 10:21:37 +0000 (12:21 +0200)]
Generinc UpdateEditor

refs #7045

Change-Id: Idad586011de488d6d188949b3817e10ac2633632

7 years agoStill fixing code after git self conflicts
Marko Luukkainen [Tue, 21 Feb 2017 14:51:41 +0000 (16:51 +0200)]
Still fixing code after git self conflicts

refs #7045

Change-Id: I2a90f04ad9a7788732caa1f9842b10e875565f14

7 years agoGit acting up, and conflicting itself. This is a fix
Marko Luukkainen [Tue, 21 Feb 2017 10:47:10 +0000 (12:47 +0200)]
Git acting up, and conflicting itself. This is a fix

refs #7045

Change-Id: Idbf8d79ec9dce3136f9dc85acf8675ab05911d83

7 years agoMerge branch 'master' of
Marko Luukkainen [Tue, 21 Feb 2017 10:44:14 +0000 (12:44 +0200)]
Merge branch 'master' of
ssh://luukkainen@www.simantics.org:29418/simantics/interop

Conflicts:
org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java
org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateOperations.java
org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateTree.java

7 years agoBase classes for model updates
Marko Luukkainen [Mon, 20 Feb 2017 13:30:40 +0000 (15:30 +0200)]
Base classes for model updates

refs #7045

Change-Id: I9ac528fcec68f834d0229c14480b00635ad42e6b

7 years agoBase classes for model updates
Marko Luukkainen [Mon, 20 Feb 2017 13:30:40 +0000 (15:30 +0200)]
Base classes for model updates

refs #7045

Change-Id: I9ac528fcec68f834d0229c14480b00635ad42e6b

7 years agoReducing use of deprecated code: using CellType enum instead of int for
Marko Luukkainen [Fri, 3 Feb 2017 08:58:13 +0000 (10:58 +0200)]
Reducing use of deprecated code: using CellType enum instead of int for
cell types.

refs #7012

Change-Id: Ib8b8f2042e258a8ce811097112247a0c7c566ec9

7 years agoExcel parsing interface
Marko Luukkainen [Thu, 2 Feb 2017 13:06:06 +0000 (15:06 +0200)]
Excel parsing interface

refs #7012

Change-Id: I49f4880147ccdd0f6b9eab4294c41f2335df6761

7 years agoSchema parsing can access data from other schemas (work in progress)
Marko Luukkainen [Thu, 2 Feb 2017 12:45:59 +0000 (14:45 +0200)]
Schema parsing can access data from other schemas (work in progress)

refs #6985

Change-Id: Ieb98b942605b85ab81e25c7fa93fcc62e387ed32

7 years ago.gitignore files
Marko Luukkainen [Thu, 2 Feb 2017 12:42:10 +0000 (14:42 +0200)]
.gitignore files

refs #6985

Change-Id: I51aa9df6cfdfcd30c58481119ecfa9f77d2a3384

7 years agoRefactoring and preparing the conversion code to handle references between XML schemas.
luukkainen [Wed, 1 Feb 2017 09:37:23 +0000 (09:37 +0000)]
Refactoring and preparing the conversion code to handle references between XML schemas.

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33442 ac1ea38d-2e2b-0410-8846-a27921b304fc

7 years agoExport XML Namespaces
luukkainen [Mon, 30 Jan 2017 11:04:51 +0000 (11:04 +0000)]
Export XML Namespaces

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33441 ac1ea38d-2e2b-0410-8846-a27921b304fc

7 years agoExport XML Namespaces
luukkainen [Mon, 30 Jan 2017 10:59:27 +0000 (10:59 +0000)]
Export XML Namespaces

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33440 ac1ea38d-2e2b-0410-8846-a27921b304fc

7 years agoHandling choice exporting properly by checking exported resource type
luukkainen [Fri, 27 Jan 2017 14:22:41 +0000 (14:22 +0000)]
Handling choice exporting properly by checking exported resource type

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33439 ac1ea38d-2e2b-0410-8846-a27921b304fc

7 years agoRefactoring Java generator code
luukkainen [Fri, 27 Jan 2017 11:41:08 +0000 (11:41 +0000)]
Refactoring Java generator code

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33438 ac1ea38d-2e2b-0410-8846-a27921b304fc

7 years agoHandling ComplexTypes inheriting AtomicType
luukkainen [Thu, 26 Jan 2017 15:33:15 +0000 (15:33 +0000)]
Handling ComplexTypes inheriting AtomicType
Fixed element specific relation handling

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33437 ac1ea38d-2e2b-0410-8846-a27921b304fc

7 years agoHandling ComplexTypes defined with SimpleContent
luukkainen [Wed, 25 Jan 2017 16:47:47 +0000 (16:47 +0000)]
Handling ComplexTypes defined with SimpleContent
Exporting multi-schema data

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33436 ac1ea38d-2e2b-0410-8846-a27921b304fc

7 years agoXML Elements are exported in the original order (if order is stored during import)
luukkainen [Wed, 25 Jan 2017 12:01:32 +0000 (12:01 +0000)]
XML Elements are exported in the original order (if order is stored during import)

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33435 ac1ea38d-2e2b-0410-8846-a27921b304fc

7 years agoInitial support for XML export (order of Elements is not kept)
luukkainen [Tue, 24 Jan 2017 12:25:59 +0000 (12:25 +0000)]
Initial support for XML export (order of Elements is not kept)
Ability to rename Elements

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33434 ac1ea38d-2e2b-0410-8846-a27921b304fc

7 years agoInitial support for multi-schema parsers
luukkainen [Fri, 20 Jan 2017 09:16:06 +0000 (09:16 +0000)]
Initial support for multi-schema parsers
Parsing multiline Base64 data did not work

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33433 ac1ea38d-2e2b-0410-8846-a27921b304fc

7 years agoHandling elements that inherit AtomicTypes
luukkainen [Thu, 19 Jan 2017 11:11:27 +0000 (11:11 +0000)]
Handling elements that inherit AtomicTypes
Handling Base64 encoded data as ByteArray

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33432 ac1ea38d-2e2b-0410-8846-a27921b304fc