summaryrefslogtreecommitdiffstats
path: root/src/modeling
diff options
context:
space:
mode:
Diffstat (limited to 'src/modeling')
-rw-r--r--src/modeling/qmodelingobject.cpp2
-rw-r--r--src/modeling/qmodelingobject.h6
-rw-r--r--src/modeling/qxmireader.cpp82
-rw-r--r--src/modeling/qxmireader.h6
-rw-r--r--src/modeling/qxmireader_p.h2
-rw-r--r--src/modeling/qxmiwriter.cpp14
6 files changed, 57 insertions, 55 deletions
diff --git a/src/modeling/qmodelingobject.cpp b/src/modeling/qmodelingobject.cpp
index 7026f50b..015f6d50 100644
--- a/src/modeling/qmodelingobject.cpp
+++ b/src/modeling/qmodelingobject.cpp
@@ -42,7 +42,7 @@
QT_BEGIN_NAMESPACE
-QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > QModelingObject::propertyDataHash;
+QHash< QString, QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > > QModelingObject::propertyDataHash;
QT_END_NAMESPACE
diff --git a/src/modeling/qmodelingobject.h b/src/modeling/qmodelingobject.h
index 8f9a7ef6..deeafbe9 100644
--- a/src/modeling/qmodelingobject.h
+++ b/src/modeling/qmodelingobject.h
@@ -75,9 +75,9 @@ public:
return _modifiedResettableProperties.contains(QString::fromLatin1(metaProperty.name()));
}
- static inline QVariant propertyData(QMetaProperty metaProperty, QtModeling::MetaPropertyDataRole role)
+ static inline QVariant propertyData(QString className, QMetaProperty metaProperty, QtModeling::MetaPropertyDataRole role)
{
- return propertyDataHash[QString::fromLatin1(metaProperty.name())][role];
+ return propertyDataHash[className][QString::fromLatin1(metaProperty.name())][role];
}
inline QStringList &modifiedResettableProperties()
@@ -89,7 +89,7 @@ protected:
QModelingObject() : deletingFromQObject(false), _qObject(0) {}
QPointer<QObject> _qObject;
QStringList _modifiedResettableProperties;
- static QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > propertyDataHash;
+ static QHash< QString, QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > > propertyDataHash;
virtual void setPropertyData() = 0;
};
diff --git a/src/modeling/qxmireader.cpp b/src/modeling/qxmireader.cpp
index 58b938ec..84586eab 100644
--- a/src/modeling/qxmireader.cpp
+++ b/src/modeling/qxmireader.cpp
@@ -42,6 +42,7 @@
#include "qxmireader_p.h"
#include "qmetamodelplugin.h"
+#include <QtModeling/QModelingObject>
#include <QtModeling/QtModelingNamespace>
#include <QtCore/QDir>
@@ -93,7 +94,7 @@ void QXmiReader::loadPlugins()
}
}
-QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
+QList<QModelingObject *> QXmiReader::readFile(QIODevice *device, QString importedId)
{
Q_D(QXmiReader);
@@ -104,10 +105,11 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
}
QXmlStreamReader reader;
reader.setDevice(device);
- QObjectList modelingObjectList;
- QObject *rootElement = 0;
+ QList<QModelingObject *> modelingObjectList;
+ QModelingObject *rootElement = 0;
bool importedIdFound = false;
QStack<QString> idStack;
+ QString currentNamespaceUri;
int insertPosition = 0;
while (!reader.atEnd()) {
@@ -126,16 +128,16 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
QFile importFile(reader.attributes().value(QString::fromLatin1("href")).toString().split(QString::fromLatin1("#")).first());
if (!importFile.open(QFile::ReadOnly | QFile::Text))
d->errors << QString::fromLatin1("Could not open imported file '%1'").arg(importFile.fileName());
- QObjectList importList = readFile(&importFile, reader.attributes().value(QString::fromLatin1("href")).toString().split(QString::fromLatin1("#")).last());
+ QList<QModelingObject *> importList = readFile(&importFile, reader.attributes().value(QString::fromLatin1("href")).toString().split(QString::fromLatin1("#")).last());
if (importList.count() > 0) {
if (elementName == QString::fromLatin1("importedPackage"))
- importList.first()->setProperty("role", QtModeling::ImportedPackageRole);
+ importList.first()->asQObject()->setProperty("role", QtModeling::ImportedPackageRole);
else if (elementName == QString::fromLatin1("importedElement"))
- importList.first()->setProperty("role", QtModeling::ImportedElementRole);
+ importList.first()->asQObject()->setProperty("role", QtModeling::ImportedElementRole);
else if (elementName == QString::fromLatin1("appliedProfile"))
- importList.first()->setProperty("role", QtModeling::AppliedProfileRole);
+ importList.first()->asQObject()->setProperty("role", QtModeling::AppliedProfileRole);
}
- foreach (QObject *importedObject, importList) {
+ foreach (QModelingObject *importedObject, importList) {
modelingObjectList.append(importedObject);
}
}
@@ -156,11 +158,13 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
xmiType = reader.qualifiedName().toString();
if (xmiType.isEmpty() || d->xmlNamespaceToImplementationNamespace[xmiType.split(':').first()].isEmpty())
continue;
- xmiType = QString::fromLatin1("%1%2 *").arg(d->xmlNamespaceToImplementationNamespace[xmiType.split(':').first()]).arg(xmiType.split(':').last());
+ xmiType = QString::fromLatin1("%1%2").arg(d->xmlNamespaceToImplementationNamespace[xmiType.split(':').first()]).arg(xmiType.split(':').last());
QString instanceName = reader.attributes().value(QString::fromLatin1("name")).toString();
if (instanceName.isEmpty())
instanceName = reader.attributes().value(QString::fromLatin1("xmi:id")).toString();
- QObject *modelingObject = createInstance(xmiType, instanceName);
+ if (!reader.namespaceUri().toString().isEmpty())
+ currentNamespaceUri = reader.namespaceUri().toString();
+ QModelingObject *modelingObject = createInstance(currentNamespaceUri, xmiType, instanceName);
if (modelingObject) {
d->idMap.insert(reader.attributes().value(QString::fromLatin1("xmi:id")).toString(), modelingObject);
if (!rootElement) {
@@ -187,7 +191,7 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
device->reset();
reader.clear();
reader.setDevice(device);
- QStack< QPair<QString, QObject *> > stack;
+ QStack< QPair<QString, QModelingObject *> > stack;
while (!reader.atEnd()) {
reader.readNext();
@@ -207,16 +211,16 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
if (id.isEmpty() && !stack.isEmpty())
continue;
- QObject *modelingObject = d->idMap.value(id);
+ QModelingObject *modelingObject = d->idMap.value(id);
if (modelingObject) {
- const QMetaObject *metaObject = modelingObject->metaObject();
+ const QMetaObject *metaObject = modelingObject->asQObject()->metaObject();
foreach (QXmlStreamAttribute attribute, reader.attributes()) {
int propertyIndex;
if ((propertyIndex = metaObject->indexOfProperty(attribute.name().toString().toLatin1())) != -1) {
QMetaProperty metaProperty = metaObject->property(propertyIndex);
if (metaProperty.type() == QVariant::Bool) {
- if (!modelingObject->setProperty(attribute.name().toString().toLatin1(), attribute.value().toString() == QString::fromLatin1("true") ? true:false))
+ if (!modelingObject->asQObject()->setProperty(attribute.name().toString().toLatin1(), attribute.value().toString() == QString::fromLatin1("true") ? true:false))
d->errors << QString::fromLatin1("Error when setting property '%1' of object with id '%2'.").arg(attribute.name().toString()).arg(id);
}
else if (metaProperty.isEnumType()) {
@@ -224,56 +228,56 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
enumName = enumName.left(1).toUpper() + enumName.mid(1);
QString propertyName = QString::fromLatin1(metaProperty.name());
enumName.prepend(propertyName.left(1).toUpper() + propertyName.mid(1));
- if (!modelingObject->setProperty(attribute.name().toString().toLatin1(), enumName))
+ if (!modelingObject->asQObject()->setProperty(attribute.name().toString().toLatin1(), enumName))
d->errors << QString::fromLatin1("Error when setting property '%1' of object with id '%2'.").arg(attribute.name().toString()).arg(id);
}
else if (metaProperty.type() == QVariant::String) {
- if (!modelingObject->setProperty(attribute.name().toString().toLatin1(), attribute.value().toString()))
+ if (!modelingObject->asQObject()->setProperty(attribute.name().toString().toLatin1(), attribute.value().toString()))
d->errors << QString::fromLatin1("Error when setting property '%1' of object with id '%2'.").arg(attribute.name().toString()).arg(id);
}
else if (metaProperty.type() == QVariant::UserType) {
- QObject *propertyObject = d->idMap.value(attribute.value().toString());
+ QModelingObject *propertyObject = d->idMap.value(attribute.value().toString());
if (propertyObject) {
QString elementName = attribute.name().toString();
elementName = elementName.left(1).toUpper() + elementName.mid(1);
- int methodCount = modelingObject->metaObject()->methodCount();
+ int methodCount = modelingObject->asQObject()->metaObject()->methodCount();
int i;
for (i = 0; i < methodCount; ++i) {
- QMetaMethod metaMethod = modelingObject->metaObject()->method(i);
+ QMetaMethod metaMethod = modelingObject->asQObject()->metaObject()->method(i);
if (QString::fromLatin1(metaMethod.name()) == QString::fromLatin1("set%1").arg(elementName)) {
- if (!metaMethod.invoke(modelingObject, ::Q_ARG(QObject *, propertyObject)))
- d->errors << QString::fromLatin1("Error when invoking metamethod '%1' on object '%2'.").arg(QString::fromLatin1(metaMethod.name())).arg(propertyObject->objectName());
+ if (!metaMethod.invoke(modelingObject->asQObject(), ::Q_ARG(QObject *, propertyObject->asQObject())))
+ d->errors << QString::fromLatin1("Error when invoking metamethod '%1' on object '%2'.").arg(QString::fromLatin1(metaMethod.name())).arg(propertyObject->asQObject()->objectName());
break;
}
}
if (i == methodCount)
- d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(propertyObject->objectName());
+ d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(propertyObject->asQObject()->objectName());
}
}
}
else
- d->errors << QString::fromLatin1("Property '%1' not found in object of type '%2'. Corresponding metamodel loaded ?").arg(attribute.name().toString()).arg(QString::fromLatin1(modelingObject->metaObject()->className()));
+ d->errors << QString::fromLatin1("Property '%1' not found in object of type '%2'. Corresponding metamodel loaded ?").arg(attribute.name().toString()).arg(QString::fromLatin1(modelingObject->asQObject()->metaObject()->className()));
}
if (!stack.isEmpty()) {
- QObject *containerObject = stack.top().second;
+ QModelingObject *containerObject = stack.top().second;
QString elementName = reader.name().toString();
elementName = elementName.left(1).toUpper() + elementName.mid(1);
- int methodCount = containerObject->metaObject()->methodCount();
+ int methodCount = containerObject->asQObject()->metaObject()->methodCount();
int i;
for (i = 0; i < methodCount; ++i) {
- QMetaMethod metaMethod = containerObject->metaObject()->method(i);
+ QMetaMethod metaMethod = containerObject->asQObject()->metaObject()->method(i);
if (QString::fromLatin1(metaMethod.name()) == QString::fromLatin1("add%1").arg(elementName) ||
QString::fromLatin1(metaMethod.name()) == QString::fromLatin1("set%1").arg(elementName)) {
- if (!metaMethod.invoke(containerObject, ::Q_ARG(QObject *, modelingObject)))
- d->errors << QString::fromLatin1("Error when invoking metamethod '%1' on object '%2'.").arg(QString::fromLatin1(metaMethod.name())).arg(containerObject->objectName());
+ if (!metaMethod.invoke(containerObject->asQObject(), ::Q_ARG(QObject *, modelingObject->asQObject())))
+ d->errors << QString::fromLatin1("Error when invoking metamethod '%1' on object '%2'.").arg(QString::fromLatin1(metaMethod.name())).arg(containerObject->asQObject()->objectName());
break;
}
}
if (i == methodCount)
- d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(containerObject->objectName());
+ d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(containerObject->asQObject()->objectName());
}
- stack.push(QPair<QString, QObject *>(reader.name().toString(), modelingObject));
+ stack.push(QPair<QString, QModelingObject *>(reader.name().toString(), modelingObject));
}
else
d->errors << QString::fromLatin1("Could not cross reference instance with id '%1' in element '%2'. Bad formed XMI file ?").arg(id).arg(reader.name().toString());
@@ -288,18 +292,14 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
return modelingObjectList;
}
-QObject *QXmiReader::createInstance(QString instanceClass, QString instanceName)
+QModelingObject *QXmiReader::createInstance(QString namespaceUri, QString instanceClass, QString instanceName)
{
- int type;
- if ((type = QMetaType::type(instanceClass.toLatin1())) != QMetaType::UnknownType) {
- const QMetaObject *metaObject = QMetaType::metaObjectForType(type);
- if (metaObject) {
- QObject *modelingObject = dynamic_cast<QObject *>(metaObject->newInstance());
- if (modelingObject) {
- modelingObject->setObjectName(instanceName);
- return modelingObject;
- }
- }
+ Q_D(QXmiReader);
+ QMetaModelPlugin *metamodelPlugin = d->metaModelPlugins[namespaceUri].first;
+ QModelingObject *modelingObject = metamodelPlugin->createModelingObject(instanceClass);
+ if (modelingObject) {
+ modelingObject->asQObject()->setObjectName(instanceName);
+ return modelingObject;
}
return 0;
}
diff --git a/src/modeling/qxmireader.h b/src/modeling/qxmireader.h
index 8dea082f..e49b4b2d 100644
--- a/src/modeling/qxmireader.h
+++ b/src/modeling/qxmireader.h
@@ -57,6 +57,8 @@ class QObject;
class QScriptEngine;
class QXmiReaderPrivate;
+class QModelingObject;
+
class Q_MODELING_EXPORT QXmiReader : public QObject
{
Q_OBJECT
@@ -68,12 +70,12 @@ public:
explicit QXmiReader(QScriptEngine *scriptEngine = 0, bool initMetaModel = false, QObject *parent = 0);
virtual ~QXmiReader();
- QObjectList readFile(QIODevice *device, QString importedId = QString::fromLatin1(""));
+ QList<QModelingObject *> readFile(QIODevice *device, QString importedId = QString::fromLatin1(""));
QStringList errorStrings() const;
protected:
void loadPlugins();
- QObject *createInstance(QString instanceClass, QString instanceName);
+ QModelingObject *createInstance(QString namespaceUri, QString instanceClass, QString instanceName);
};
QT_END_NAMESPACE
diff --git a/src/modeling/qxmireader_p.h b/src/modeling/qxmireader_p.h
index 966d5971..7bb3bfe9 100644
--- a/src/modeling/qxmireader_p.h
+++ b/src/modeling/qxmireader_p.h
@@ -64,7 +64,7 @@ public:
explicit QXmiReaderPrivate();
virtual ~QXmiReaderPrivate();
- QHash<QString, QObject *> idMap;
+ QHash<QString, QModelingObject *> idMap;
QHash< QString, QPair<QMetaModelPlugin *, QJsonObject> > metaModelPlugins;
QHash<QString, QString> xmlNamespaceToImplementationNamespace;
QStringList errors;
diff --git a/src/modeling/qxmiwriter.cpp b/src/modeling/qxmiwriter.cpp
index 46eb834a..c5cde4a6 100644
--- a/src/modeling/qxmiwriter.cpp
+++ b/src/modeling/qxmiwriter.cpp
@@ -148,14 +148,14 @@ void QXmiWriter::populateIdMap(QObject *modelingObject, int index)
QMetaProperty metaProperty = metaObject->property(i);
QString typeName = QString::fromLatin1(metaProperty.typeName());
QVariant variant = metaProperty.read(modelingObject);
- QString aggregationRole = QModelingObject::propertyData(metaProperty, QtModeling::AggregationRole).toString();
+ QString aggregationRole = QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::AggregationRole).toString();
if (aggregationRole == QStringLiteral("composite"))
- if (!QModelingObject::propertyData(metaProperty, QtModeling::OppositeEndRole).toString().isEmpty()) {
- d->blacklistedOppositeEnds << QModelingObject::propertyData(metaProperty, QtModeling::OppositeEndRole).toString().split('-').last();
+ if (!QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::OppositeEndRole).toString().isEmpty()) {
+ d->blacklistedOppositeEnds << QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::OppositeEndRole).toString().split('-').last();
}
- if (QModelingObject::propertyData(metaProperty, QtModeling::AggregationRole).toString() != QStringLiteral("composite"))
+ if (QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::AggregationRole).toString() != QStringLiteral("composite"))
continue;
if (typeName.endsWith('*') && qvariant_cast<QObject *>(variant))
@@ -203,7 +203,7 @@ void QXmiWriter::writeObject(QObject *modelingObject, QString elementName)
QMetaProperty metaProperty = metaObject->property(i);
QVariant variant = metaProperty.read(modelingObject);
- if (!metaProperty.isStored() || QString::fromLatin1(metaProperty.name()) == QStringLiteral("objectName") || QModelingObject::propertyData(metaProperty, QtModeling::IsDerivedUnionRole).toBool())
+ if (!metaProperty.isStored() || QString::fromLatin1(metaProperty.name()) == QStringLiteral("objectName") || QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::IsDerivedUnionRole).toBool())
continue;
if (metaProperty.type() == QVariant::String) {
@@ -233,10 +233,10 @@ void QXmiWriter::writeObject(QObject *modelingObject, QString elementName)
QString typeName = QString::fromLatin1(metaProperty.typeName());
QVariant variant = metaProperty.read(modelingObject);
- QString aggregationRole = QModelingObject::propertyData(metaProperty, QtModeling::AggregationRole).toString();
+ QString aggregationRole = QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::AggregationRole).toString();
QString modifiedPropertyName = QString::fromLatin1(metaProperty.name()).remove(QRegularExpression(QStringLiteral("_$"))).remove(QRegularExpression(QStringLiteral("s$"))).replace(QRegularExpression(QStringLiteral("ie$")), QStringLiteral("y")).replace(QRegularExpression(QStringLiteral("sse$")), QStringLiteral("ss")).replace(QRegularExpression(QStringLiteral("ice$")), QStringLiteral("ex")).replace(QRegularExpression(QStringLiteral("ce$")), QStringLiteral("x"));
- if (!metaProperty.isStored() || QModelingObject::propertyData(metaProperty, QtModeling::IsDerivedUnionRole).toBool())
+ if (!metaProperty.isStored() || QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::IsDerivedUnionRole).toBool())
continue;
if (typeName.endsWith('*') && qvariant_cast<QObject *>(variant)) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 16:52:50 +0000