Oliver Kellogg | 1 Jan 14:59 2005
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

Save changeability in XMI standard compliant format.

  M +8 -7      umlrole.cpp   1.36

--- kdesdk/umbrello/umbrello/umlrole.cpp  #1.35:1.36
 <at>  <at>  -174,12 +174,11  <at>  <at>  void UMLRole::saveToXMI( QDomDocument & 
         switch (m_Changeability) {
                 case Uml::chg_Frozen:
-                        roleElement.setAttribute("changeable", "frozen");
+                        roleElement.setAttribute("changeability", "frozen");
                         break;
                 case Uml::chg_AddOnly:
-                        roleElement.setAttribute("changeable", "addOnly");
+                        roleElement.setAttribute("changeability", "addOnly");
                         break;
                 case Uml::chg_Changeable:
-                        // This is the default.
-                        // roleElement.setAttribute("changeable", "none");
+                        roleElement.setAttribute("changeability", "changeable");
                         break;
         }
 <at>  <at>  -343,8 +342,10  <at>  <at>  bool UMLRole::load( QDomElement & elemen
         // Changeability defaults to Changeable if it cant set it here..
         m_Changeability = Uml::chg_Changeable;
-        QString changeable = element.attribute("changeable", "none");
-        if (changeable == "frozen")
+        QString changeability = element.attribute("changeability", "");
+        if (changeability.isEmpty())
(Continue reading)

Oliver Kellogg | 2 Jan 00:38 2005
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

ClassifierWidget::drawMembers(): Remove the bodyOffsetY arg and fix
a regression in argument/operation text Y coordinate computation.

  M +2 -2      classifierwidget.cpp   1.7
  M +1 -1      classifierwidget.h   1.7
  M +6 -14     classwidget.cpp   1.38
  M +4 -7      interfacewidget.cpp   1.31

--- kdesdk/umbrello/umbrello/classifierwidget.cpp  #1.6:1.7
 <at>  <at>  -203,5 +203,5  <at>  <at>  int ClassifierWidget::displayedOperation

 void ClassifierWidget::drawMembers(QPainter & p, Uml::Object_Type ot, Uml::Signature_Type sigType,
-                                   int x, int bodyOffsetY, int y, int fontHeight) {
+                                   int x, int y, int fontHeight) {
         QFont f = UMLWidget::getFont();
         f.setBold(false);
 <at>  <at>  -216,5 +216,5  <at>  <at>  void ClassifierWidget::drawMembers(QPain
                 p.setFont( f );
                 QFontMetrics fontMetrics(f);
-                p.drawText(x, bodyOffsetY + y, fontMetrics.width(text), fontHeight, AlignVCenter, text);
+                p.drawText(x, y, fontMetrics.width(text), fontHeight, AlignVCenter, text);
                 f.setItalic(false);
                 f.setUnderline(false);

--- kdesdk/umbrello/umbrello/classifierwidget.h  #1.6:1.7
 <at>  <at>  -201,5 +201,5  <at>  <at>  protected:
          */
         void drawMembers(QPainter & p, Uml::Object_Type ot, Uml::Signature_Type sigType,
(Continue reading)

Oliver Kellogg | 2 Jan 00:52 2005
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

Comment by M. Alanen:
> Additionally, each subClass needs a 
>      <UML:GeneralizableElement.generalization> 
>       <UML:Generalization xmi.idref="e5" /> 
>      </UML:GeneralizableElement.generalization> 
> where "e5" here means the id of the Generalization. 
CCBUG:56184

  M +15 -0     classifier.cpp   1.65

--- kdesdk/umbrello/umbrello/classifier.cpp  #1.64:1.65
 <at>  <at>  -432,4 +432,19  <at>  <at>  void UMLClassifier::saveToXMI(QDomDocume
                 qElement.appendChild( tmplElement );
         }
+        //save generalizations (we are the subclass, the other end is the superclass)
+        UMLAssociationList generalizations = getSpecificAssocs(Uml::at_Generalization);
+        if (generalizations.count()) {
+                QDomElement genElement = qDoc.createElement("UML:GeneralizableElement.generalization");
+                for (UMLAssociation *a = generalizations.first(); a; a = generalizations.next()) {
+                        // We are the subclass if we are at the role A end.
+                        if (m_nId != a->getObjectId(Uml::A))
+                                continue;
+                        QDomElement gElem = qDoc.createElement("UML:Generalization");
+                        gElem.setAttribute( "xmi.idref", ID2STR(a->getID()) );
+                        genElement.appendChild(gElem);
+                }
+                if (genElement.hasChildNodes())
+                        qElement.appendChild( genElement );
(Continue reading)

Oliver Kellogg | 2 Jan 00:53 2005
Picon
Picon

[Bug 56184] Umbrello XMI file format doesn't conform with uml13.dtd

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.

http://bugs.kde.org/show_bug.cgi?id=56184        

------- Additional Comments From okellogg users sourceforge net  2005-01-02 00:52 -------
CVS commit by okellogg: 

Comment by M. Alanen:
> Additionally, each subClass needs a 
>      <UML:GeneralizableElement.generalization> 
>       <UML:Generalization xmi.idref="e5" /> 
>      </UML:GeneralizableElement.generalization> 
> where "e5" here means the id of the Generalization. 
CCBUG:56184

  M +15 -0     classifier.cpp   1.65

--- kdesdk/umbrello/umbrello/classifier.cpp  #1.64:1.65
  <at>  -432,4 +432,19   <at>  void UMLClassifier::saveToXMI(QDomDocume
                 qElement.appendChild( tmplElement );
         }
+        //save generalizations (we are the subclass, the other end is the superclass)
+        UMLAssociationList generalizations = getSpecificAssocs(Uml::at_Generalization);
+        if (generalizations.count()) {
+                QDomElement genElement = qDoc.createElement("UML:GeneralizableElement.generalization");
+                for (UMLAssociation *a = generalizations.first(); a; a = generalizations.next()) {
+                        // We are the subclass if we are at the role A end.
+                        if (m_nId != a->getObjectId(Uml::A))
+                                continue;
(Continue reading)

Martin Fabian Hohenberg | 2 Jan 01:17 2005
Picon

[Bug 96141] New: crashes when hitting ESC while editing a new diagram field

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.

http://bugs.kde.org/show_bug.cgi?id=96141        
           Summary: crashes when hitting ESC while editing a new diagram
                    field
           Product: umbrello
           Version: 1.3.2
          Platform: unspecified
        OS/Version: Linux
            Status: UNCONFIRMED
          Severity: crash
          Priority: NOR
         Component: general
        AssignedTo: uml-devel lists sourceforge net
        ReportedBy: martin.hohenberg sigma-draconis de

Version:           1.3.2 (using KDE 3.3.2,  (3.1))
Compiler:          gcc version 3.3.5 (Debian 1:3.3.5-5)
OS:                Linux (i686) release 2.6.10

This is reproducable on my system ...

Using host libthread_db library "/lib/tls/i686/cmov/libthread_db.so.1".
`system-supplied DSO at 0xffffe000' has disappeared; keeping its symbols.
[Thread debugging using libthread_db enabled]
[New Thread -1230294912 (LWP 15590)]
[KCrash handler]
#4  0x00000000 in ?? ()
#5  0x0817d6ec in UMLView::setupNewWidget ()
(Continue reading)

Oliver Kellogg | 2 Jan 16:40 2005
Picon
Picon

[Bug 56184] Umbrello XMI file format doesn't conform with uml13.dtd

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.

http://bugs.kde.org/show_bug.cgi?id=56184        

------- Additional Comments From okellogg users sourceforge net  2005-01-02 16:40 -------
Marcus Alanen wrote:
> AssociationEnds should further have 
> - isNavigable = "(true|false)" 
> - type = "id"  where id is the id of the class where we point to
> - ordering = "(unordered|ordered)" if order of elements matters
> - aggregation = "(none|aggregate|composite)" (nothing, empty diamond,
>  black diamond) 

Just to make sure I am understanding, here are my assumptions:

1) Simple (undirected) association between class A and class B

AssociationEnd A:  isNavigable="true"
AssociationEnd B:  isNavigable="true

2) Directed association from class A to class B
   (arrowhead at B)

AssociationEnd A:  isNavigable="false"
AssociationEnd B:  isNavigable="true"

3) Aggregation: A has a reference to B
   (hollow diamond at A)

(Continue reading)

Marcus Alanen | 2 Jan 18:58 2005
Picon

[Bug 56184] Umbrello XMI file format doesn't conform with uml13.dtd

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.

http://bugs.kde.org/show_bug.cgi?id=56184        

------- Additional Comments From maalanen abo fi  2005-01-02 18:58 -------
> 1) Simple (undirected) association between class A and class B
> 
> AssociationEnd A:  isNavigable="true"
> AssociationEnd B:  isNavigable="true

Yes, OK.

> 2) Directed association from class A to class B
>    (arrowhead at B)
> 
> AssociationEnd A:  isNavigable="false"
> AssociationEnd B:  isNavigable="true"

I had to check... This is how we're doing it as well. OK.

> 3) Aggregation: A has a reference to B
>    (hollow diamond at A)
> 
> AssociationEnd A:  isNavigable="false" aggregation="aggregate"
> AssociationEnd B:  isNavigable="true" aggregation="none"

OK, although there's no reason why isNavigable couldn't be true
also at the A end. The way you do it above, you should draw it
as a hollow diamond at A, and an arrowhead at B. (In programming you
(Continue reading)

Oliver Kellogg | 2 Jan 20:19 2005
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

getUniqueUMLObjectName(): Remove, use UMLDoc::uniqObjectName() instead.
getUniqueChildUMLObjectName(): Remove, use UMLCanvasObject::uniqChildName instead.

  M +14 -92    umllistview.cpp   1.140
  M +0 -10     umllistview.h   1.55

Oliver Kellogg | 3 Jan 06:55 2005
Picon
Picon

kdesdk/umbrello/umbrello

CVS commit by okellogg: 

Comment by M. Alanen:
> Currently, AssociationEnds sometimes have and sometimes don't
> the isNavigable and aggregation attributes. They are both mandatory. 
CCBUG:56184

  M +10 -0     association.cpp   1.64
  M +15 -2     association.h   1.33
  M +27 -11    umlrole.cpp   1.37

Oliver Kellogg | 3 Jan 06:55 2005
Picon
Picon

[Bug 56184] Umbrello XMI file format doesn't conform with uml13.dtd

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.

http://bugs.kde.org/show_bug.cgi?id=56184        

------- Additional Comments From okellogg users sourceforge net  2005-01-03 06:55 -------
CVS commit by okellogg: 

Comment by M. Alanen:
> Currently, AssociationEnds sometimes have and sometimes don't
> the isNavigable and aggregation attributes. They are both mandatory. 
CCBUG:56184

  M +10 -0     association.cpp   1.64
  M +15 -2     association.h   1.33
  M +27 -11    umlrole.cpp   1.37

-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt

Gmane