Merge remote-tracking branch 'origin/develop' into develop

Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/c76a0bf6
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/c76a0bf6
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/c76a0bf6

Branch: refs/heads/develop
Commit: c76a0bf6151f61a5fdd67b425d7e8748de4cafef
Parents: 3a26d21 4fb01aa
Author: niclas <nic...@hedhman.org>
Authored: Fri Apr 6 08:44:39 2018 +0800
Committer: niclas <nic...@hedhman.org>
Committed: Fri Apr 6 08:44:39 2018 +0800

----------------------------------------------------------------------
 .../api/composite/CompositeDescriptor.java      |  4 +-
 .../polygene/api/object/ObjectDescriptor.java   |  3 +-
 .../api/service/ImportedServiceDescriptor.java  |  3 +-
 .../api/util/VisitableModelDescriptor.java      | 30 ++++++++++
 .../runtime/composite/CompositeModel.java       |  2 +-
 .../runtime/composite/CompositesModel.java      | 61 +++++++++++++++++++
 .../runtime/composite/TransientsModel.java      | 38 +-----------
 .../polygene/runtime/entity/EntitiesModel.java  | 40 ++-----------
 .../polygene/runtime/object/ObjectModel.java    |  2 +-
 .../polygene/runtime/object/ObjectsModel.java   | 34 ++---------
 .../runtime/service/ImportedServiceModel.java   |  2 +-
 .../service/ImportedServicesInstance.java       |  4 +-
 .../runtime/service/ImportedServicesModel.java  | 49 ++++-----------
 .../runtime/service/ServicesInstance.java       |  4 +-
 .../polygene/runtime/service/ServicesModel.java | 60 ++++---------------
 .../polygene/runtime/structure/ModuleModel.java | 63 ++++----------------
 .../polygene/runtime/value/ValuesModel.java     | 40 ++-----------
 .../skeletons/SQLCompatEntityStateWrapper.java  |  7 +++
 .../polygene/library/rdf/model/Model2XML.java   |  2 +-
 .../ImportedServiceCompositeDescriptor.java     |  7 +++
 20 files changed, 170 insertions(+), 285 deletions(-)
----------------------------------------------------------------------


Reply via email to