Commit 4f78b1e4 authored by Robert Loehning's avatar Robert Loehning

ModelEditor: Fix copy/paste mistakes

Change-Id: I580d3f7a97ab81fcc6aaca1b83c0f25b1d8d1ce6
Reviewed-by: default avatarJochen Becher <jochen_becher@gmx.de>
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 6344815d
......@@ -147,7 +147,7 @@ void StereotypeDisplayVisitor::visitDItem(const DItem *item)
m_stereotypeSmartDisplay = DObject::StereotypeIcon;
visitDObject(item);
if (m_stereotypeIconId.isEmpty() && !item->shape().isEmpty())
m_shapeIconId = m_stereotypeController->findStereotypeIconId(StereotypeIcon::ElementItem, QStringList(item->shape()));
m_stereotypeIconId = m_stereotypeController->findStereotypeIconId(StereotypeIcon::ElementItem, QStringList(item->shape()));
if (m_shapeIconId.isEmpty() && !item->variety().isEmpty())
m_shapeIconId = m_stereotypeController->findStereotypeIconId(StereotypeIcon::ElementItem, QStringList(item->variety()));
}
......
......@@ -768,7 +768,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
this, &PropertiesView::MView::onAssociationEndBKindChanged);
}
if (isSingleSelection) {
if ((!isValidAssociationKindIndex(m_endAKind->currentIndex())
if ((!isValidAssociationKindIndex(m_endBKind->currentIndex())
|| association->endB().kind() != translateIndexToAssociationKind(m_endBKind->currentIndex()))
&& !m_endBKind->hasFocus()) {
m_endBKind->setCurrentIndex(translateAssociationKindToIndex(association->endB().kind()));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment