Commit c068be02 authored by Oliver Kellogg's avatar Oliver Kellogg
Browse files

umbrello/basictypes.h

- In AssociationType::Enum,
  - shorten Coll_Message_Asynchronous to Coll_Mesg_Async;
  - shorten Coll_Message_Synchronous  to Coll_Mesg_Sync;
  - shorten Coll_Message_Self         to Coll_Mesg_Self.

umbrello/worktoolbar.h
- In enum ToolBar_Buttons,
  - shorten tbb_Coll_Message_Synchronous to tbb_Coll_Mesg_Sync;
  - shorten tbb_Coll_Message_Asynchronous to tbb_Coll_Mesg_Async.
- In public slots,
  - shorten slotColl_Message_Synchronous  to slotColl_Mesg_Sync;
  - shorten slotColl_Message_Asynchronous to slotColl_Mesg_Async.

Files affected:
- umbrello/assocrules.cpp
- umbrello/basictypes.cpp
- umbrello/dialogs/pages/associationgeneralpage.cpp
- umbrello/toolbarstateassociation.cpp
- umbrello/toolbarstatefactory.cpp
- umbrello/uml1model/association.cpp
- umbrello/umlwidgets/associationline.cpp
- umbrello/umlwidgets/associationwidget.cpp
- umbrello/umlwidgets/umlwidget.cpp
- umbrello/worktoolbar.cpp
parent 5015ce47
......@@ -80,8 +80,8 @@ bool AssocRules::allowAssociation(Uml::AssociationType::Enum assocType, UMLWidge
case Uml::AssociationType::Association:
case Uml::AssociationType::UniAssociation:
case Uml::AssociationType::Dependency:
case Uml::AssociationType::Coll_Message_Synchronous:
case Uml::AssociationType::Coll_Message_Asynchronous:
case Uml::AssociationType::Coll_Mesg_Sync:
case Uml::AssociationType::Coll_Mesg_Async:
case Uml::AssociationType::Generalization://can have many sub/super types
case Uml::AssociationType::Aggregation:
case Uml::AssociationType::Relationship:
......@@ -201,8 +201,8 @@ bool AssocRules::allowAssociation(Uml::AssociationType::Enum assocType,
case Uml::AssociationType::Association:
case Uml::AssociationType::UniAssociation:
case Uml::AssociationType::Dependency:
case Uml::AssociationType::Coll_Message_Synchronous:
case Uml::AssociationType::Coll_Message_Asynchronous:
case Uml::AssociationType::Coll_Mesg_Sync:
case Uml::AssociationType::Coll_Mesg_Async:
case Uml::AssociationType::Aggregation:
case Uml::AssociationType::Relationship:
return true; // doesn't matter what's already connected to widget
......@@ -488,8 +488,8 @@ AssocRules::Assoc_Rule AssocRules::m_AssocRules[] = {
{ All, Uml::AssociationType::Containment, WidgetBase::wt_Interface, WidgetBase::wt_Datatype, false, false, false, false, Any },
{ All, Uml::AssociationType::Containment, WidgetBase::wt_Component, WidgetBase::wt_Component, false, false, false, false, Any },
{ All, Uml::AssociationType::Containment, WidgetBase::wt_Component, WidgetBase::wt_Artifact, false, false, false, false, Any },
{ All, Uml::AssociationType::Coll_Message_Synchronous, WidgetBase::wt_Object, WidgetBase::wt_Object, true, false, true, true, Any },
{ All, Uml::AssociationType::Coll_Message_Asynchronous, WidgetBase::wt_Object, WidgetBase::wt_Object, true, false, true, true, Any },
{ All, Uml::AssociationType::Coll_Mesg_Sync, WidgetBase::wt_Object, WidgetBase::wt_Object, true, false, true, true, Any },
{ All, Uml::AssociationType::Coll_Mesg_Async, WidgetBase::wt_Object, WidgetBase::wt_Object, true, false, true, true, Any },
{ All, Uml::AssociationType::State, WidgetBase::wt_State, WidgetBase::wt_State, true, false, true, true, Any },
{ All, Uml::AssociationType::State, WidgetBase::wt_ForkJoin, WidgetBase::wt_State, true, false, true, true, Any },
{ All, Uml::AssociationType::State, WidgetBase::wt_State, WidgetBase::wt_ForkJoin, true, false, true, true, Any },
......
......@@ -293,14 +293,14 @@ QString toString(Enum item)
return QLatin1String("Association");
case Association_Self:
return QLatin1String("Association_Self");
case Coll_Message_Asynchronous:
return QLatin1String("Coll_Message_Asynchronous");
case Coll_Message_Synchronous:
return QLatin1String("Coll_Message_Synchronous");
case Coll_Mesg_Async:
return QLatin1String("Coll_Mesg_Async");
case Coll_Mesg_Sync:
return QLatin1String("Coll_Mesg_Sync");
case Seq_Message:
return QLatin1String("Seq_Message");
case Coll_Message_Self:
return QLatin1String("Coll_Message_Self");
case Coll_Mesg_Self:
return QLatin1String("Coll_Mesg_Self");
case Seq_Message_Self:
return QLatin1String("Seq_Message_Self");
case Containment:
......@@ -349,13 +349,13 @@ QString toStringI18n(Enum item)
return i18n("Association");
case Association_Self:
return i18n("Self Association");
case Coll_Message_Asynchronous:
case Coll_Mesg_Async:
return i18n("Collaboration Asynchronous Message");
case Coll_Message_Synchronous:
case Coll_Mesg_Sync:
return i18n("Collaboration Synchronous Message");
case Seq_Message:
return i18n("Sequence Message");
case Coll_Message_Self:
case Coll_Mesg_Self:
return i18n("Collaboration Self Message");
case Seq_Message_Self:
return i18n("Sequence Self Message");
......@@ -405,14 +405,14 @@ Enum fromString(const QString& item)
return Association;
else if (item == QLatin1String("Association_Self"))
return Association_Self;
else if (item == QLatin1String("Coll_Message_Asynchronous"))
return Coll_Message_Asynchronous;
else if (item == QLatin1String("Coll_Message_Synchronous"))
return Coll_Message_Synchronous;
else if (item == QLatin1String("Coll_Mesg_Async"))
return Coll_Mesg_Async;
else if (item == QLatin1String("Coll_Mesg_Sync"))
return Coll_Mesg_Sync;
else if (item == QLatin1String("Seq_Message"))
return Seq_Message;
else if (item == QLatin1String("Coll_Message_Self"))
return Coll_Message_Self;
else if (item == QLatin1String("Coll_Mesg_Self"))
return Coll_Mesg_Self;
else if (item == QLatin1String("Seq_Message_Self"))
return Seq_Message_Self;
else if (item == QLatin1String("Containment"))
......
......@@ -109,9 +109,9 @@ namespace Uml
Dependency,
Association,
Association_Self,
Coll_Message_Asynchronous,
Coll_Mesg_Async,
Seq_Message,
Coll_Message_Self,
Coll_Mesg_Self,
Seq_Message_Self,
Containment,
Composition,
......@@ -124,7 +124,7 @@ namespace Uml
Category2Parent,
Child2Category,
Relationship,
Coll_Message_Synchronous,
Coll_Mesg_Sync,
// enter new entries before this line
Reserved,
Unknown = - 1
......
......@@ -139,8 +139,8 @@ void AssociationGeneralPage::constructWidget()
// UMLScene based checks
if (m_pAssociationWidget->umlScene()->type() == Uml::DiagramType::Collaboration
&& !(assocType == Uml::AssociationType::Coll_Message_Asynchronous
|| assocType == Uml::AssociationType::Coll_Message_Synchronous
&& !(assocType == Uml::AssociationType::Coll_Mesg_Async
|| assocType == Uml::AssociationType::Coll_Mesg_Sync
|| assocType == Uml::AssociationType::Anchor))
continue;
......
......@@ -302,8 +302,8 @@ Uml::AssociationType::Enum ToolBarStateAssociation::getAssociationType()
case WorkToolBar::tbb_Seq_Combined_Fragment:
case WorkToolBar::tbb_Seq_Precondition:
case WorkToolBar::tbb_Seq_Message_Asynchronous: at = Uml::AssociationType::Seq_Message; break;
case WorkToolBar::tbb_Coll_Message_Synchronous: at = Uml::AssociationType::Coll_Message_Synchronous; break;
case WorkToolBar::tbb_Coll_Message_Asynchronous: at = Uml::AssociationType::Coll_Message_Asynchronous; break;
case WorkToolBar::tbb_Coll_Mesg_Sync: at = Uml::AssociationType::Coll_Mesg_Sync; break;
case WorkToolBar::tbb_Coll_Mesg_Async: at = Uml::AssociationType::Coll_Mesg_Async; break;
case WorkToolBar::tbb_State_Transition: at = Uml::AssociationType::State; break;
case WorkToolBar::tbb_Activity_Transition: at = Uml::AssociationType::Activity; break;
case WorkToolBar::tbb_Exception: at = Uml::AssociationType::Exception; break;
......
......@@ -78,8 +78,8 @@ int ToolBarStateFactory::getKey(const WorkToolBar::ToolBar_Buttons &toolbarButto
case WorkToolBar::tbb_Composition: return 1;
case WorkToolBar::tbb_Containment: return 1;
case WorkToolBar::tbb_Anchor: return 1;
case WorkToolBar::tbb_Coll_Message_Synchronous: return 1;
case WorkToolBar::tbb_Coll_Message_Asynchronous: return 1;
case WorkToolBar::tbb_Coll_Mesg_Sync: return 1;
case WorkToolBar::tbb_Coll_Mesg_Async: return 1;
case WorkToolBar::tbb_State_Transition: return 1;
case WorkToolBar::tbb_Activity_Transition: return 1;
case WorkToolBar::tbb_Exception: return 1;
......
......@@ -399,7 +399,7 @@ bool UMLAssociation::load1(QDomElement & element)
"associationself", // Uml::AssociationType::Association_Self
"collmessage", // Uml::AssociationType::Coll_Message
"seqmessage", // Uml::AssociationType::Seq_Message
"collmessageself", // Uml::AssociationType::Coll_Message_Self
"collmessageself", // Uml::AssociationType::Coll_Mesg_Self
"seqmessageself", // Uml::AssociationType::Seq_Message_Self
"implementation", // Uml::AssociationType::Implementation
"composition", // Uml::AssociationType::Composition
......
......@@ -574,9 +574,9 @@ void AssociationLine::reconstructSymbols()
removeCollaborationLine();
break;
case Uml::AssociationType::Coll_Message_Synchronous:
case Uml::AssociationType::Coll_Message_Asynchronous:
case Uml::AssociationType::Coll_Message_Self:
case Uml::AssociationType::Coll_Mesg_Sync:
case Uml::AssociationType::Coll_Mesg_Async:
case Uml::AssociationType::Coll_Mesg_Self:
setStartSymbol(Symbol::None);
setEndSymbol(Symbol::None);
removeSubsetSymbol();
......@@ -670,7 +670,7 @@ void AssociationLine::createCollaborationLine()
m_collaborationLineItem = new QGraphicsLineItem(m_associationWidget);
m_collaborationLineItem->setPen(p);
if (m_associationWidget->associationType() == Uml::AssociationType::Coll_Message_Synchronous) {
if (m_associationWidget->associationType() == Uml::AssociationType::Coll_Mesg_Sync) {
m_collaborationLineHead = new Symbol(Symbol::ClosedArrow, m_associationWidget);
m_collaborationLineHead->setBrush(p.color());
}
......
......@@ -144,7 +144,7 @@ AssociationWidget* AssociationWidget::create
case Uml::AssociationType::Generalization:
case Uml::AssociationType::Dependency:
case Uml::AssociationType::Association_Self:
case Uml::AssociationType::Coll_Message_Self:
case Uml::AssociationType::Coll_Mesg_Self:
case Uml::AssociationType::Seq_Message_Self:
case Uml::AssociationType::Containment:
case Uml::AssociationType::Realization:
......@@ -1384,9 +1384,9 @@ bool AssociationWidget::containsAsEndpoint(UMLWidget* widget)
bool AssociationWidget::isCollaboration() const
{
Uml::AssociationType::Enum at = associationType();
return (at == AssociationType::Coll_Message_Synchronous
|| at == AssociationType::Coll_Message_Asynchronous
|| at == AssociationType::Coll_Message_Self);
return (at == AssociationType::Coll_Mesg_Sync
|| at == AssociationType::Coll_Mesg_Async
|| at == AssociationType::Coll_Mesg_Self);
}
/**
......
......@@ -919,7 +919,7 @@ void UMLWidget::slotMenuSelection(QAction *trigger)
case ListPopupMenu::mt_MessageDestroy:
case ListPopupMenu::mt_MessageSynchronous:
// MessageWidget *widget = new MessageWidget(umlScene(), this);
// addConnectedWidget(widget, Uml::AssociationType::Coll_Message_Synchronous);
// addConnectedWidget(widget, Uml::AssociationType::Coll_Mesg_Sync);
case ListPopupMenu::mt_MessageAsynchronous:
case ListPopupMenu::mt_MessageFound:
case ListPopupMenu::mt_MessageLost:
......
......@@ -156,8 +156,8 @@ void WorkToolBar::slotCheckToolBar(Uml::DiagramType::Enum dt)
case Uml::DiagramType::Collaboration:
insertHotBtn(tbb_Object);
insertHotBtn(tbb_Coll_Message_Asynchronous);
insertHotBtn(tbb_Coll_Message_Synchronous);
insertHotBtn(tbb_Coll_Mesg_Async);
insertHotBtn(tbb_Coll_Mesg_Sync);
break;
case Uml::DiagramType::State:
......@@ -389,8 +389,8 @@ void WorkToolBar::loadPixmaps()
{ tbb_Pin, i18n("Pin"), Icon_Utils::it_Pin, SLOT(slotPin()) },
{ tbb_Port, i18n("Port"), Icon_Utils::it_Pin, SLOT(slotPort()) },
{ tbb_Initial_Activity, i18n("Initial Activity"), Icon_Utils::it_Activity_Initial, SLOT(slotInitial_Activity()) },
{ tbb_Coll_Message_Synchronous, i18n("Synchronous Message"), Icon_Utils::it_Message_Synchronous, SLOT(slotColl_Message_Synchronous()) },
{ tbb_Coll_Message_Asynchronous,i18n("Asynchronous Message"), Icon_Utils::it_Message_Asynchronous, SLOT(slotColl_Message_Asynchronous()) },
{ tbb_Coll_Mesg_Sync, i18n("Synchronous Message"), Icon_Utils::it_Message_Synchronous, SLOT(slotColl_Mesg_Sync()) },
{ tbb_Coll_Mesg_Async, i18n("Asynchronous Message"), Icon_Utils::it_Message_Asynchronous, SLOT(slotColl_Mesg_Async()) },
{ tbb_Exception, i18n("Exception"), Icon_Utils::it_Exception, SLOT(slotException()) },
{ tbb_Object_Node, i18n("Object Node"), Icon_Utils::it_Object_Node, SLOT(slotObject_Node()) },
{ tbb_PrePostCondition, i18n("Pre/Post condition"), Icon_Utils::it_Condition_PrePost, SLOT(slotPrePostCondition()) },
......@@ -432,9 +432,9 @@ void WorkToolBar::slotAggregation() { buttonChanged(tbb_Aggregation
void WorkToolBar::slotDependency() { buttonChanged(tbb_Dependency); }
void WorkToolBar::slotAssociation() { buttonChanged(tbb_Association); }
void WorkToolBar::slotContainment() { buttonChanged(tbb_Containment); }
void WorkToolBar::slotColl_Message_Synchronous() { buttonChanged(tbb_Coll_Message_Synchronous); }
void WorkToolBar::slotColl_Message_Asynchronous(){ buttonChanged(tbb_Coll_Message_Asynchronous);}
void WorkToolBar::slotSeq_Message_Creation() { buttonChanged(tbb_Seq_Message_Creation); }
void WorkToolBar::slotColl_Mesg_Sync() { buttonChanged(tbb_Coll_Mesg_Sync); }
void WorkToolBar::slotColl_Mesg_Async() { buttonChanged(tbb_Coll_Mesg_Async); }
void WorkToolBar::slotSeq_Message_Creation() { buttonChanged(tbb_Seq_Message_Creation); }
void WorkToolBar::slotSeq_Message_Destroy() { buttonChanged(tbb_Seq_Message_Destroy); }
void WorkToolBar::slotSeq_Message_Synchronous() { buttonChanged(tbb_Seq_Message_Synchronous); }
void WorkToolBar::slotSeq_Message_Asynchronous() { buttonChanged(tbb_Seq_Message_Asynchronous); }
......
......@@ -62,8 +62,8 @@ public:
tbb_Dependency,
tbb_Association,
tbb_Containment,
tbb_Coll_Message_Synchronous,
tbb_Coll_Message_Asynchronous,
tbb_Coll_Mesg_Sync,
tbb_Coll_Mesg_Async,
tbb_Seq_Message_Creation,
tbb_Seq_Message_Destroy,
tbb_Seq_Message_Synchronous,
......@@ -170,8 +170,8 @@ public slots:
void slotDependency();
void slotAssociation();
void slotContainment();
void slotColl_Message_Synchronous();
void slotColl_Message_Asynchronous();
void slotColl_Mesg_Sync();
void slotColl_Mesg_Async();
void slotSeq_Message_Creation();
void slotSeq_Message_Destroy();
void slotSeq_Message_Synchronous();
......
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