GitLab

Fix memory leaks in class UMLDoc by not deleting class members and not disconnecting signal/slot connections.

CCBUG:347498

CCBUG:340646

CCBUG:340646

Guard access to UMLObject::m_pSecondary with QPointer.
Also use dynamic_cast instead of static_cast for access
to m_pSecondary to make sure the cast returns zero on
invalid types. Using static_casts may result into
invalid casted objects.

BUG:345388
FIXED-IN:2.15.97 (KDE 15.03.97)

Move stereotype related methods into one place and add
createStereotype() public, which is missing from public api.

Oliver Kellogg authored Sep 23, 2014 and Ralf Habacker committed Oct 27, 2014

(In reply to Mark Stanton from comment #0)
> [...] The display doesn't resize and the app crashes.
> I may have tried this before the project had fully loaded. [...]

The backtrace confirms this, apparently you double clicked on a class widget
on a diagram while Umbrello was still busy in UMLDoc::resolveTypes().
By the way, Umbrello is finished loading when you see "Ready." in the lower
left corner of Umbrello's main window.

The following changes fend off double clicks on diagram objects while the
program is still busy in loadFromXMI() or resolveTypes():

umbrello/umldoc.cpp
- In default constructor, initialize m_bTypesAreResolved to true.
- In function closeDocument() remove assignment to m_bTypesAreResolved.
- In function openDocument(),
  - Add a few missing KIO::NetAccess::removeTempFile() calls in return-on-
    error situations;
  - Set m_bTypesAreResolved false before loadFromXMI()/loadFromMDL() calls;
  - Set m_bLoading false and m_bTypesAreResolved true before returning.
- In function loading() return true also when m_bTypesAreResolved is false.
- In function resolveTypes() postpone setting of m_bTypesAreResolved to true
  until type resolution has actually completed.

umbrello/umlscene.cpp
- In function mousePressEvent() call m_pToolBarState->mouseDoubleClick()
  only if m_doc->loading() returns false.

CCBUG: 339278

(In reply to Mark Stanton from comment #0)
> [...] The display doesn't resize and the app crashes.
> I may have tried this before the project had fully loaded. [...]

The backtrace confirms this, apparently you double clicked on a class widget
on a diagram while Umbrello was still busy in UMLDoc::resolveTypes().
By the way, Umbrello is finished loading when you see "Ready." in the lower
left corner of Umbrello's main window.

The following changes fend off double clicks on diagram objects while the
program is still busy in loadFromXMI() or resolveTypes():

umbrello/umldoc.cpp
- In default constructor, initialize m_bTypesAreResolved to true.
- In function closeDocument() remove assignment to m_bTypesAreResolved.
- In function openDocument(),
  - Add a few missing KIO::NetAccess::removeTempFile() calls in return-on-
    error situations;
  - Set m_bTypesAreResolved false before loadFromXMI()/loadFromMDL() calls;
  - Set m_bLoading false and m_bTypesAreResolved true before returning.
- In function loading() return true also when m_bTypesAreResolved is false.
- In function resolveTypes() postpone setting of m_bTypesAreResolved to true
  until type resolution has actually completed.

umbrello/umlscene.cpp
- In function mousePressEvent() call m_pToolBarState->mouseDoubleClick()
  only if m_doc->loading() returns false.

CCBUG: 339278

- Fix typo in apidoc.

> Created attachment 87920 [details]
> Demo file for the format generated by Embarcadero's "Describe" UML tool
> [...]
> Umbrello does not complain on loading - but nothing is actually imported.

The following changes add support for loading the demo file:

umbrello/{association,classifier,enum,operation,package}.cpp function load()
- Support special tags used by Embarcadero Describe.

umbrello/object_factory.cpp function makeObjectFromXMI()
- Support association special tag <UML:Aggregation> used by Embarcadero.

umbrello/umldoc.cpp
- In function loadFromXMI(), support <UML:Model> equivalent tag <UML:Project>
  used by Embarcadero Describe.
- In function loadUMLObjectsFromXMI(), support <UML:Namespace.ownedElement>
  equivalent tag <UML:Element.ownedElement> used by Embarcadero Describe.

umbrello/umlobject.cpp fuction loadFromXMI()
- Generate new UniqueID for all cases of non existent xmi id.
- Downgrade non existence of xmi.id from error to warning.

CCBUG:56184

Compile Umbrello with -DQT_NO_CAST_FROM_ASCII and -DQT_NO_CAST_TO_ASCII.

- At calls to QDomElement::attribute() remove "" when given as optional arg

- Remove unused functions  appendClasses(), appendInterfaces()

umbrello/umldoc.{h,cpp}
- Remove unused functions classes(), interfaces()

- In function openDocument(), at tests of `filetype' extension,
  - Simplify tests by using QString::endsWith() in lieu of indexOf(QRegExp())
  - Add test for extension ".tar.gz";
- At function createDiagramName(), fix doc of @param name.

umbrello/umllistview.cpp
- At start of function slotDiagramCreated(), replace condition for premature
  return `m_doc->loading()' by `findItem(id)'.
  Reason: On importing Rose MDL files, diagram listview items are not created
  at all if (m_doc->loading()) is in effect.
- At function setDocument(), fix typo in doc.

CCBUG:56184

CCBUG:56184

BUG:335030
FIXED-IN:4.13.2

There were two problems causing the XMI file in the bug report to be
saved incorrectly, resulting in crashes after opening again. One problem
was association objects not being added to the document correctly. The other
problem was the nesting in the list view items: The classifiers were
nested in a folder that did not exist in the XMI. Fixed this by adding
the classifiers to the parent of the non-existent folder.

BUG: 334069
FIXED-IN: 4.13.1

There were two problems causing the XMI file in the bug report to be
saved incorrectly, resulting in crashes after opening again. One problem
was association objects not being added to the document correctly. The other
problem was the nesting in the list view items: The classifiers were
nested in a folder that did not exist in the XMI. Fixed this by adding
the classifiers to the parent of the non-existent folder.

BUG: 334069
FIXED-IN: 4.13.1

  https://bugs.kde.org/attachment.cgi?id=86180 (Eclipse UML2)
and
  http://www.omg.org/spec/UML/20110701/Infrastructure.xmi

umbrello/model_utils.{h,cpp}
- New function getXmiId(QDomElement) encapsulates access to xmi.id (XMI-1)
  and xmi:id (XMI-2)

umbrello/{umlobject,folder,operation}.cpp
- Replace direct accesses to QDomElement::attribute("xmi.id") by
  Model_Utils::getXmiId()

umbrello/{folder,package}.cpp
- In function load(QDomElement&), decode UML2 tags packagedElement and
  ownedElement.

umbrello/umldoc.cpp
- In function loadFromXMI(QIODevice&, short), decode outerTag values
  "Model" and "Package" for UML2;
- In function loadUMLObjectsFromXMI(QDomElement&),
  - decode UML2 tags packagedElement and ownedElement;
  - admit XMI2 syntax "xmi:id" to the check for xmi.id presence.

umbrello/classifier.cpp
- In function makeChildObject(const QString&), support UML2 tags
  ownedOperation and ownedAttribute.

CCBUG:56184

- Add ENC_WINDOWS for use by encoding(QIODevice&)

umbrello/umldoc.cpp
- short UMLDoc::encoding(QIODevice & file) :
  - Introduce variable 'enc' with initial value ENC_UNKNOWN
  - In loop advancing over comments and processing instructions, if
    node.isProcessingInstruction() then analyze the
    node.toProcessingInstruction().data(); if attribute "encoding" is
    found then extract its value. Assign ENC_UNICODE to enc if value is
    "UTF-8"; assign ENC_WINDOWS to enc if value is "windows-1252"; else
    assign ENC_OLD_ENC to enc (indicating a not yet implemented encoding.)
  - Change uWarning() messages added in commit 732b50aa to uDebug()
  - For premature returns, return variable 'enc' instead of ENC_UNKNOWN.
    Reason: Returning ENC_UNKNOWN here is overly strict, it precludes any
    further attempts at loading foreign XMI files. Rather, use the encoding
    attribute from the processing instruction if found.
- bool UMLDoc::loadFromXMI(QIODevice & file, short encode) :
  Extend check which makes sure it is an XMI file to permit "xmi:XMI" as
  root.tagName()

CCBUG:56184

CCBUG:331746
FIXED-IN:4.13.0
(cherry picked from commit 0460ab0d)

CCBUG:331746

CCBUG: 329648

Summary of changes:
 * Track removal of umlobjects, widgets and diagrams in command history
 * Creating (and removing) diagrams can be undone
 * Commands always use IDs instead of pointers (potential fix for many related bugs)
 * Use macro's for moving and deleting multiple widgets
 * Clipboard actions use the command history (widget/umlobject creation)
 * Restore the CmdSetStereotype command
 * Cleanup useless change font/change multiplicity

UR commands reference diagrams and widgets by ID instead of keeping a pointer
to the objects. Pointers are unfit for the purpose of the commands because both
creation and removal of the objects can be undone - invalidating the pointers.

Because one UMLObject can have multiple widgets, the widgets can not be
identified by only the id(). To fix that issue, the localID from ObjectWidget
has been moved to UMLWidget. This does not change the existing behaviour of
ObjectWidgets but allows the UR commands to identify widgets that share the
same id.

REVIEW: 114744

Decoding of UMLObjects now uses the same code path on all clips. Fixes that
recently went to clip1 are now also active for clip2 (diagrams). List view
items are never decoded, but created in response of a signal of new UMLObjects.

When pasting clip2 in the same file, only the diagram gets duplicated and not
all contained UMLObjects, like described in feature request 85807.

BUG: 327910
BUG: 327670
CCBUG: 85807

This also makes the behaviour of the (still partly broken) diagram duplication
a bit more acceptable/usable untill bug 327670 has been resolved.

CCBUG: 327669

Some debug message tweaks