[Uml-devel] kdesdk/umbrello/umbrello

[Brian Thomas]

CVS commit by thomas: 

A combination patch to fix bug of loading older XMI files and associations
which are 'self' (e.g. connected to the same class). There appears to be 
a number of problems in the code which I have only stepped around but not
really fixed, these include the fact that umlwidget id's are being confused,
sometimes used (in the case of floating text on associations) as object id's
and at other times as widget ids (irrespective of owning umlobject). The XMI
file is incorrectly (IMO) recording these id's as 'xmi.id' and then upon loading
the floatingtext widget re-assigning the id to something free. The other issue
is that the 'adjustAssocs' method appears to be improperly used both in places
where it isnt needed and in terms of input params. This method, which calls
associationwidget->widgetMoved() fails to correctly calculate points  for self-
associations (e.g. attached to the same classwidget). Its not clear what the
correct input in these cases ought to be. Nevertheless, other than loading
self-associations from XMI, this patch fixes a number of other fatal and non-fatal
bugs and issues.


  M +4 -2      association.cpp   1.19
  M +38 -11    associationwidget.cpp   1.49
  M +1 -1      classwidget.cpp   1.11
  M +12 -4     floatingtext.cpp   1.26
  M +16 -0     linepath.cpp   1.19
  M +3 -0      linepath.h   1.7
  M +2 -2      umldoc.cpp   1.73
  M +58 -21    umlview.cpp   1.96
  M +1 -2      umlview.h   1.39
  M +17 -13    umlwidget.cpp   1.52