Commit 7939c270 authored by Thomas Hartmann's avatar Thomas Hartmann Committed by Marco Bubke

QmlDesigner.model: refactoring for nodeSource

I changed customParserSource into nodeSource and use it also for
components. This means we do not use auxiliaryData anymore with some magic
__component_data identifier.
To distinguish between CustumParserSource and ComponentSource I introduced
the enum NodeSourceType.
Also in this patch I added auxiliaryData in the creation of a node. This was useful
for prototyping and will help with prototyping/testing in the future.

Change-Id: I2152c26c0c767f869f7dce7209abf43f594fd2ad
Reviewed-on: http://codereview.qt.nokia.com/399Reviewed-by: default avatarMarco Bubke <marco.bubke@nokia.com>
parent 3d784b84
......@@ -196,7 +196,7 @@ void ComponentView::instanceInformationsChange(const QVector<ModelNode> &/*nodeL
void ComponentView::instancesRenderImageChanged(const QVector<ModelNode> &/*nodeList*/) {}
void ComponentView::instancesPreviewImageChanged(const QVector<ModelNode> &/*nodeList*/) {}
void ComponentView::instancesChildrenChanged(const QVector<ModelNode> &/*nodeList*/) {}
void ComponentView::customParserSourceChanged(const ModelNode &, const QString & /*newCustomParserSource*/) {}
void ComponentView::nodeSourceChanged(const ModelNode &, const QString & /*newNodeSource*/) {}
void ComponentView::rewriterBeginTransaction() {}
void ComponentView::rewriterEndTransaction() {}
......
......@@ -81,7 +81,7 @@ public:
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
void customParserSourceChanged(const ModelNode &modelNode, const QString &newCustomParserSource);
void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
void rewriterBeginTransaction();
void rewriterEndTransaction();
......
......@@ -92,7 +92,7 @@ void DesignDocumentControllerView::instancesChildrenChanged(const QVector<ModelN
}
void DesignDocumentControllerView::customParserSourceChanged(const ModelNode &, const QString & /*newCustomParserSource*/)
void DesignDocumentControllerView::nodeSourceChanged(const ModelNode &, const QString & /*newNodeSource*/)
{
}
......
......@@ -68,7 +68,7 @@ public:
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
void customParserSourceChanged(const ModelNode &modelNode, const QString &newCustomParserSource);
void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
void rewriterBeginTransaction();
void rewriterEndTransaction();
......
......@@ -172,7 +172,7 @@ void ItemLibraryView::instancesChildrenChanged(const QVector<ModelNode> &/*nodeL
}
void ItemLibraryView::customParserSourceChanged(const ModelNode &, const QString & /*newCustomParserSource*/)
void ItemLibraryView::nodeSourceChanged(const ModelNode &, const QString & /*newNodeSource*/)
{
}
......
......@@ -84,7 +84,7 @@ public:
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
void customParserSourceChanged(const ModelNode &modelNode, const QString &newCustomParserSource);
void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
void rewriterBeginTransaction();
void rewriterEndTransaction();
......
......@@ -235,7 +235,7 @@ void NavigatorView::instancesChildrenChanged(const QVector<ModelNode> &/*nodeLis
}
void NavigatorView::customParserSourceChanged(const ModelNode &, const QString & /*newCustomParserSource*/)
void NavigatorView::nodeSourceChanged(const ModelNode &, const QString & /*newNodeSource*/)
{
}
......
......@@ -92,7 +92,7 @@ public:
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
void customParserSourceChanged(const ModelNode &modelNode, const QString &newCustomParserSource);
void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
void rewriterBeginTransaction();
void rewriterEndTransaction();
......
......@@ -107,7 +107,8 @@ SOURCES += $$PWD/model/abstractview.cpp \
$$PWD/instances/imagecontainer.cpp \
$$PWD/instances/completecomponentcommand.cpp \
$$PWD/instances/componentcompletedcommand.cpp \
$$PWD/instances/changecustomparsersourcecommand.cpp \
$$PWD/instances/changenodesourcecommand.cpp \
$$PWD/instances/changeauxiliarycommand.cpp \
$$PWD/instances/addimportcontainer.cpp
HEADERS += $$PWD/include/corelib_global.h \
......@@ -216,7 +217,8 @@ HEADERS += $$PWD/include/corelib_global.h \
$$PWD/instances/imagecontainer.h \
$$PWD/instances/completecomponentcommand.h \
$$PWD/instances/componentcompletedcommand.h \
$$PWD/instances/changecustomparsersourcecommand.h \
$$PWD/instances/changenodesourcecommand.h \
$$PWD/instances/changeauxiliarycommand.h \
$$PWD/instances/addimportcontainer.h
contains(CONFIG, plugin) {
# If core.pri has been included in the qmldesigner plugin
......
......@@ -86,7 +86,9 @@ public:
int majorVersion,
int minorVersion,
const PropertyListType &propertyList = PropertyListType(),
const QString &customParserSource = QString());
const PropertyListType &auxPropertyList = PropertyListType(),
const QString &nodeSource = QString(),
ModelNode::NodeSourceType nodeSourceType = ModelNode::NoSource);
const ModelNode rootModelNode() const;
ModelNode rootModelNode();
......@@ -141,7 +143,7 @@ public:
virtual void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) = 0;
virtual void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) = 0;
virtual void instancesChildrenChanged(const QVector<ModelNode> &nodeList) = 0;
virtual void customParserSourceChanged(const ModelNode &modelNode, const QString &newCustomParserSource) = 0;
virtual void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) = 0;
virtual void rewriterBeginTransaction() = 0;
virtual void rewriterEndTransaction() = 0;
......
......@@ -86,6 +86,12 @@ class CORESHARED_EXPORT ModelNode
friend class QmlDesigner::NodeProperty;
public:
enum NodeSourceType {
NoSource = 0,
CustomParserSource = 1,
ComponentSource = 2
};
ModelNode();
ModelNode(const Internal::InternalNodePointer &internalNode, Model *model, AbstractView *view);
ModelNode(const ModelNode modelNode, AbstractView *view);
......@@ -167,14 +173,17 @@ public:
QVariant auxiliaryData(const QString &name) const;
void setAuxiliaryData(const QString &name, const QVariant &data) const;
bool hasAuxiliaryData(const QString &name) const;
QHash<QString, QVariant> auxiliaryData() const;
qint32 internalId() const;
void setCustomParserSource(const QString&);
QString customParserSource() const;
void setNodeSource(const QString&);
QString nodeSource() const;
QString convertTypeToImportAlias() const;
NodeSourceType nodeSourceType() const;
private: // functions
Internal::InternalNodePointer internalNode() const;
QString generateNewId() const;
......
......@@ -44,6 +44,7 @@ class PropertyValueContainer;
class ChangeFileUrlCommand;
class ChangeValuesCommand;
class ChangeBindingsCommand;
class ChangeAuxiliaryCommand;
class CreateSceneCommand;
class CreateInstancesCommand;
class ClearSceneCommand;
......@@ -54,7 +55,7 @@ class RemovePropertiesCommand;
class ChangeStateCommand;
class AddImportCommand;
class CompleteComponentCommand;
class ChangeCustomParserSourceCommand;
class ChangeNodeSourceCommand;
class NodeInstanceServerInterface : public QObject
{
......@@ -75,12 +76,13 @@ public:
virtual void removeProperties(const RemovePropertiesCommand &command) = 0;
virtual void changePropertyBindings(const ChangeBindingsCommand &command) = 0;
virtual void changePropertyValues(const ChangeValuesCommand &command) = 0;
virtual void changeAuxiliaryValues(const ChangeAuxiliaryCommand &command) = 0;
virtual void reparentInstances(const ReparentInstancesCommand &command) = 0;
virtual void changeIds(const ChangeIdsCommand &command) = 0;
virtual void changeState(const ChangeStateCommand &command) = 0;
virtual void addImport(const AddImportCommand &command) = 0;
virtual void completeComponent(const CompleteComponentCommand &command) = 0;
virtual void changeCustomParserSource(const ChangeCustomParserSourceCommand &command) = 0;
virtual void changeNodeSource(const ChangeNodeSourceCommand &command) = 0;
static void registerCommands();
};
......
......@@ -109,7 +109,7 @@ public:
void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
void auxiliaryDataChanged(const ModelNode &node, const QString &name, const QVariant &data);
void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data);
void customParserSourceChanged(const ModelNode &modelNode, const QString &newCustomParserSource);
void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
void rewriterBeginTransaction();
void rewriterEndTransaction();
......
......@@ -119,7 +119,7 @@ public:
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList);
void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports);
void customParserSourceChanged(const ModelNode &modelNode, const QString &newCustomParserSource);
void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
protected:
NodeInstance instanceForModelNode(const ModelNode &modelNode);
......
......@@ -143,7 +143,7 @@ public:
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
void customParserSourceChanged(const ModelNode &modelNode, const QString &newCustomParserSource);
void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
void rewriterBeginTransaction();
void rewriterEndTransaction();
......@@ -200,6 +200,7 @@ signals:
public slots:
void qmlTextChanged();
void delayedSetup();
protected: // functions
Internal::ModelToTextMerger *modelToTextMerger() const;
......
......@@ -30,41 +30,41 @@
**
**************************************************************************/
#include "changecustomparsersourcecommand.h"
#include "changenodesourcecommand.h"
namespace QmlDesigner {
ChangeCustomParserSourceCommand::ChangeCustomParserSourceCommand()
ChangeNodeSourceCommand::ChangeNodeSourceCommand()
{
}
ChangeCustomParserSourceCommand::ChangeCustomParserSourceCommand(qint32 newInstanceId, const QString &newCustomParserSource)
: m_instanceId(newInstanceId), m_customParserSource(newCustomParserSource)
ChangeNodeSourceCommand::ChangeNodeSourceCommand(qint32 newInstanceId, const QString &newNodeSource)
: m_instanceId(newInstanceId), m_nodeSource(newNodeSource)
{
}
qint32 ChangeCustomParserSourceCommand::instanceId() const
qint32 ChangeNodeSourceCommand::instanceId() const
{
return m_instanceId;
}
QString ChangeCustomParserSourceCommand::customParserSource() const
QString ChangeNodeSourceCommand::nodeSource() const
{
return m_customParserSource;
return m_nodeSource;
}
QDataStream &operator<<(QDataStream &out, const ChangeCustomParserSourceCommand &command)
QDataStream &operator<<(QDataStream &out, const ChangeNodeSourceCommand &command)
{
out << command.instanceId();
out << command.customParserSource();
out << command.nodeSource();
return out;
}
QDataStream &operator>>(QDataStream &in, ChangeCustomParserSourceCommand &command)
QDataStream &operator>>(QDataStream &in, ChangeNodeSourceCommand &command)
{
in >> command.m_instanceId;
in >> command.m_customParserSource;
in >> command.m_nodeSource;
return in;
}
......
......@@ -30,32 +30,32 @@
**
**************************************************************************/
#ifndef CHANGECUSTOMPARSERSOURCECOMMAND_H
#define CHANGECUSTOMPARSERSOURCECOMMAND_H
#ifndef CHANGENODESOURCECOMMAND_H
#define CHANGENODESOURCECOMMAND_H
#include <QMetaType>
namespace QmlDesigner {
class ChangeCustomParserSourceCommand
class ChangeNodeSourceCommand
{
friend QDataStream &operator>>(QDataStream &in, ChangeCustomParserSourceCommand &command);
friend QDataStream &operator>>(QDataStream &in, ChangeNodeSourceCommand &command);
public:
ChangeCustomParserSourceCommand();
ChangeCustomParserSourceCommand(qint32 instanceId, const QString &customParserSource);
ChangeNodeSourceCommand();
ChangeNodeSourceCommand(qint32 instanceId, const QString &nodeSource);
qint32 instanceId() const;
QString customParserSource() const;
QString nodeSource() const;
private:
qint32 m_instanceId;
QString m_customParserSource;
QString m_nodeSource;
};
QDataStream &operator<<(QDataStream &out, const ChangeCustomParserSourceCommand &command);
QDataStream &operator>>(QDataStream &in, ChangeCustomParserSourceCommand &command);
QDataStream &operator<<(QDataStream &out, const ChangeNodeSourceCommand &command);
QDataStream &operator>>(QDataStream &in, ChangeNodeSourceCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::ChangeCustomParserSourceCommand)
Q_DECLARE_METATYPE(QmlDesigner::ChangeNodeSourceCommand)
#endif // CHANGECUSTOMPARSERSOURCECOMMAND_H
#endif // CHANGENODESOURCECOMMAND_H
......@@ -70,27 +70,24 @@ bool ComponentNodeInstance::hasContent() const
return true;
}
void ComponentNodeInstance::setPropertyVariant(const QString &name, const QVariant &value)
void ComponentNodeInstance::setNodeSource(const QString &source)
{
if (name == "__component_data") {
QByteArray importArray;
foreach(const QString &import, nodeInstanceServer()->imports()) {
importArray.append(import.toUtf8());
}
QByteArray importArray;
foreach (const QString &import, nodeInstanceServer()->imports()) {
importArray.append(import.toUtf8());
}
QByteArray data(value.toByteArray());
QByteArray data(source.toUtf8());
data.prepend(importArray);
data.append("\n");
data.prepend(importArray);
data.append("\n");
component()->setData(data, QUrl(nodeInstanceServer()->fileUrl().toString() +
QLatin1Char('_')+ id()));
setId(id());
}
component()->setData(data, QUrl(nodeInstanceServer()->fileUrl().toString() +
QLatin1Char('_')+ id()));
setId(id());
if (component()->isError()) {
qDebug() << value;
qDebug() << source;
foreach(const QDeclarativeError &error, component()->errors())
qDebug() << error;
}
......
......@@ -50,10 +50,10 @@ public:
ComponentNodeInstance(QDeclarativeComponent *component);
static Pointer create(QObject *objectToBeWrapped);
void setPropertyVariant(const QString &name, const QVariant &value);
bool hasContent() const;
void setNodeSource(const QString &source);
private: //function
QDeclarativeComponent *component() const;
......
......@@ -43,6 +43,7 @@ CreateSceneCommand::CreateSceneCommand(const QVector<InstanceContainer> &instanc
const QVector<IdContainer> &idVector,
const QVector<PropertyValueContainer> &valueChangeVector,
const QVector<PropertyBindingContainer> &bindingChangeVector,
const QVector<PropertyValueContainer> &auxiliaryChangeVector,
const QVector<AddImportContainer> &importVector,
const QUrl &fileUrl)
: m_instanceVector(instanceContainer),
......@@ -50,6 +51,7 @@ CreateSceneCommand::CreateSceneCommand(const QVector<InstanceContainer> &instanc
m_idVector(idVector),
m_valueChangeVector(valueChangeVector),
m_bindingChangeVector(bindingChangeVector),
m_auxiliaryChangeVector(auxiliaryChangeVector),
m_importVector(importVector),
m_fileUrl(fileUrl)
{
......@@ -80,6 +82,11 @@ QVector<PropertyBindingContainer> CreateSceneCommand::bindingChanges() const
return m_bindingChangeVector;
}
QVector<PropertyValueContainer> CreateSceneCommand::auxiliaryChanges() const
{
return m_auxiliaryChangeVector;
}
QVector<AddImportContainer> CreateSceneCommand::imports() const
{
return m_importVector;
......@@ -97,6 +104,7 @@ QDataStream &operator<<(QDataStream &out, const CreateSceneCommand &command)
out << command.ids();
out << command.valueChanges();
out << command.bindingChanges();
out << command.auxiliaryChanges();
out << command.imports();
out << command.fileUrl();
......@@ -110,6 +118,7 @@ QDataStream &operator>>(QDataStream &in, CreateSceneCommand &command)
in >> command.m_idVector;
in >> command.m_valueChangeVector;
in >> command.m_bindingChangeVector;
in >> command.m_auxiliaryChangeVector;
in >> command.m_importVector;
in >> command.m_fileUrl;
......
......@@ -57,6 +57,7 @@ public:
const QVector<IdContainer> &idVector,
const QVector<PropertyValueContainer> &valueChangeVector,
const QVector<PropertyBindingContainer> &bindingChangeVector,
const QVector<PropertyValueContainer> &auxiliaryChangeVector,
const QVector<AddImportContainer> &importVector,
const QUrl &fileUrl);
......@@ -65,6 +66,7 @@ public:
QVector<IdContainer> ids() const;
QVector<PropertyValueContainer> valueChanges() const;
QVector<PropertyBindingContainer> bindingChanges() const;
QVector<PropertyValueContainer> auxiliaryChanges() const;
QVector<AddImportContainer> imports() const;
QUrl fileUrl() const;
......@@ -74,6 +76,7 @@ private:
QVector<IdContainer> m_idVector;
QVector<PropertyValueContainer> m_valueChangeVector;
QVector<PropertyBindingContainer> m_bindingChangeVector;
QVector<PropertyValueContainer> m_auxiliaryChangeVector;
QVector<AddImportContainer> m_importVector;
QUrl m_fileUrl;
};
......
......@@ -39,9 +39,9 @@ InstanceContainer::InstanceContainer()
{
}
InstanceContainer::InstanceContainer(qint32 instanceId, const QString &type, int majorNumber, int minorNumber, const QString &componentPath, const QString &customParserSource)
InstanceContainer::InstanceContainer(qint32 instanceId, const QString &type, int majorNumber, int minorNumber, const QString &componentPath, const QString &nodeSource, NodeSourceType nodeSourceType)
: m_instanceId(instanceId), m_type(type), m_majorNumber(majorNumber), m_minorNumber(minorNumber), m_componentPath(componentPath),
m_customParserSource(customParserSource)
m_nodeSource(nodeSource), m_nodeSourceType(nodeSourceType)
{
m_type.replace(QLatin1Char('.'), QLatin1Char('/'));
}
......@@ -71,9 +71,14 @@ QString InstanceContainer::componentPath() const
return m_componentPath;
}
QString InstanceContainer::customParserSource() const
QString InstanceContainer::nodeSource() const
{
return m_customParserSource;
return m_nodeSource;
}
InstanceContainer::NodeSourceType InstanceContainer::nodeSourceType() const
{
return static_cast<NodeSourceType>(m_nodeSourceType);
}
QDataStream &operator<<(QDataStream &out, const InstanceContainer &container)
......@@ -83,7 +88,8 @@ QDataStream &operator<<(QDataStream &out, const InstanceContainer &container)
out << container.majorNumber();
out << container.minorNumber();
out << container.componentPath();
out << container.customParserSource();
out << container.nodeSource();
out << container.nodeSourceType();
return out;
}
......@@ -96,7 +102,8 @@ QDataStream &operator>>(QDataStream &in, InstanceContainer &container)
in >> container.m_majorNumber;
in >> container.m_minorNumber;
in >> container.m_componentPath;
in >> container.m_customParserSource;
in >> container.m_nodeSource;
in >> container.m_nodeSourceType;
return in;
}
......
......@@ -48,23 +48,31 @@ class InstanceContainer
friend QDataStream &operator>>(QDataStream &in, InstanceContainer &container);
public:
enum NodeSourceType {
NoSource = 0,
CustomParserSource = 1,
ComponentSource = 2
};
InstanceContainer();
InstanceContainer(qint32 instanceId, const QString &type, int majorNumber, int minorNumber, const QString &componentPath, const QString &customParserSource);
InstanceContainer(qint32 instanceId, const QString &type, int majorNumber, int minorNumber, const QString &componentPath, const QString &nodeSource, NodeSourceType nodeSourceType);
qint32 instanceId() const;
QString type() const;
int majorNumber() const;
int minorNumber() const;
QString componentPath() const;
QString customParserSource() const;
QString nodeSource() const;
NodeSourceType nodeSourceType() const;
private:
qint32 m_instanceId;
QString m_type;
int m_majorNumber;
int m_minorNumber;
qint32 m_majorNumber;
qint32 m_minorNumber;
QString m_componentPath;
QString m_customParserSource;
QString m_nodeSource;
qint32 m_nodeSourceType;
};
} // namespace QmlDesigner
......
......@@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD/../include
HEADERS += $$PWD/behaviornodeinstance.h
HEADERS += $$PWD/changeauxiliarycommand.h
HEADERS += $$PWD/informationnodeinstanceserver.h
HEADERS += $$PWD/dummycontextobject.h
HEADERS += $$PWD/rendernodeinstanceserver.h
......@@ -18,7 +19,7 @@ HEADERS += $$PWD/addimportcommand.h
HEADERS += $$PWD/changebindingscommand.h
HEADERS += $$PWD/changefileurlcommand.h
HEADERS += $$PWD/changeidscommand.h
HEADERS += $$PWD/changecustomparsersourcecommand.h
HEADERS += $$PWD/changenodesourcecommand.h
HEADERS += $$PWD/changestatecommand.h
HEADERS += $$PWD/changevaluescommand.h
HEADERS += $$PWD/childrenchangeeventfilter.h
......@@ -54,6 +55,7 @@ HEADERS += $$PWD/../include/nodeinstanceserverinterface.h
SOURCES += $$PWD/behaviornodeinstance.cpp
SOURCES += $$PWD/changeauxiliarycommand.cpp
SOURCES += $$PWD/informationnodeinstanceserver.cpp
SOURCES += $$PWD/dummycontextobject.cpp
SOURCES += $$PWD/rendernodeinstanceserver.cpp
......@@ -69,7 +71,7 @@ SOURCES += $$PWD/addimportcommand.cpp
SOURCES += $$PWD/changebindingscommand.cpp
SOURCES += $$PWD/changefileurlcommand.cpp
SOURCES += $$PWD/changeidscommand.cpp
SOURCES += $$PWD/changecustomparsersourcecommand.cpp
SOURCES += $$PWD/changenodesourcecommand.cpp
SOURCES += $$PWD/changestatecommand.cpp
SOURCES += $$PWD/changevaluescommand.cpp
SOURCES += $$PWD/childrenchangeeventfilter.cpp
......
......@@ -49,6 +49,7 @@
#include "createscenecommand.h"
#include "changevaluescommand.h"
#include "changebindingscommand.h"
#include "changeauxiliarycommand.h"
#include "changefileurlcommand.h"
#include "removeinstancescommand.h"
#include "clearscenecommand.h"
......@@ -67,7 +68,7 @@
#include "imagecontainer.h"
#include "statepreviewimagechangedcommand.h"
#include "componentcompletedcommand.h"
#include "changecustomparsersourcecommand.h"
#include "changenodesourcecommand.h"
namespace QmlDesigner {
......@@ -239,6 +240,11 @@ void NodeInstanceClientProxy::changePropertyValues(const ChangeValuesCommand &co
nodeInstanceServer()->changePropertyValues(command);
}
void NodeInstanceClientProxy::changeAuxiliaryValues(const ChangeAuxiliaryCommand &command)
{