1. 13 May, 2014 2 commits
    • Ralf Habacker's avatar
      Fix Krazy issue. · 45700601
      Ralf Habacker authored
      45700601
    • Oliver Kellogg's avatar
      (In reply to comment #11) · a113a1be
      Oliver Kellogg authored
      > handleControlledUnit(): New. To be fleshed out Real Soon Now.
      Real Soon Now has turned into 7 years...
      
      umbrello/petaltree2uml.{h,cpp}
      - Start fleshing out function handleControlledUnit - tested so far only
        using .cat file, not .sub file.
      - Remove duplicated function names in texts at uDebug() / uError()
      - At function petalTree2Uml add optional bool argument requireDesign
        defaulting to true. If requireDesign is false then:
        - Do not check for root->name() == "Design"
        - Do not attempt root->findAttribute("root_category"); instead, set
          root_category to root directly.
        - Do not call umldoc->setCurrentRoot(), the current root was already set
          by the loadFromMDL call on the .mdl file (with requireDesign = true.)
        - Do not call importView() for the UseCase, Component, or Deployment view.
      
      umbrello/import_rose.{h,cpp}
      - At function loadFromMDL add optional bool argument requireDesign
        defaulting to true. Pass requireDesign into call to petalTree2Uml.
      
      CCBUG:81364
      a113a1be
  2. 12 May, 2014 1 commit
  3. 09 May, 2014 1 commit
  4. 08 May, 2014 4 commits
    • Joris Steyn's avatar
      Fix XMI 1.1 load/save issues · e13d3493
      Joris Steyn authored
      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
      e13d3493
    • Oliver Kellogg's avatar
      umbrello/codeimport/idlimport.cpp · ec7a3c05
      Oliver Kellogg authored
      umbrello/codeimport/javaimport.cpp
      umbrello/codeimport/pascalimport.cpp
      
      - Fix crashes on code import related to incorrect assignment to m_scope.
      ec7a3c05
    • Oliver Kellogg's avatar
      umbrello/codeimport/nativeimportbase.cpp · 9e4aa0c2
      Oliver Kellogg authored
      - Fix crashes in code import caused by not clearing m_scope on each
        invocation of parseFile()
      9e4aa0c2
    • Oliver Kellogg's avatar
      umbrello/codeimport/adaimport.cpp · 17abd847
      Oliver Kellogg authored
      - Fix crash on Ada import seen after primary crash cause was lifted
        (followup to commit 3094593e)
      
      CCBUG:333363
      17abd847
  5. 07 May, 2014 2 commits
  6. 30 Apr, 2014 3 commits
  7. 29 Apr, 2014 4 commits
  8. 27 Apr, 2014 3 commits
  9. 26 Apr, 2014 3 commits
  10. 25 Apr, 2014 2 commits
    • Ralf Habacker's avatar
      Add find text in tree view, current diagram and all diagrams feature. · e13d4c31
      Ralf Habacker authored
      The implementation adds menu entries and keyboard shortcuts for 'find', 'find next' and
      'find previous' functions.
      
      On start of a find operation a dialog will be opened, which allows to set the find filter
      and a simple search text. Depending on the selected filter all tree view elements or elements
      from the current or all diagrams are compared case insensitive against the search text.
      The results are stored for later access and the first result will be displayed as described below.
      
      Running 'find next' or 'find previous' using the 'tree view' filter will select the related search result,
      
      Running 'find next' or 'find previous' with current diagram or all diagrams filter set, shows the related
      view and selects the requested widget, which is positioned in the center of the view with a 100% zoom.
      If a related tree view item is present, it will also be selected.
      
      The implementation is undo/redo proof, because it stores scene/object/widget id's instead of pointers.
      
      CCBUG:116354
      e13d4c31
    • Ralf Habacker's avatar
  11. 24 Apr, 2014 3 commits
  12. 23 Apr, 2014 5 commits
  13. 22 Apr, 2014 1 commit
  14. 21 Apr, 2014 3 commits
    • Oliver Kellogg's avatar
      Cosmetics: Remove spaces at line end. · bbf4f903
      Oliver Kellogg authored
      bbf4f903
    • Oliver Kellogg's avatar
      Cosmetics: Replace tab by 8 spaces. · 45268896
      Oliver Kellogg authored
      45268896
    • Oliver Kellogg's avatar
      Followup to commit c0d58b3b for loading UML2/XMI2 files · 3ded4560
      Oliver Kellogg authored
      umbrello/object_factory.cpp function makeObjectFromXMI() :
      - Map UML2 PrimitiveType to UMLClassifier with base type ot_Datatype.
      
      umbrello/attribute.cpp function load() :
      - Replace direct accesses to QDomElement::attribute("xmi.id") by
        Model_Utils::getXmiId()
      - If no xmi.id attribute is found in tempElement then check for attribute
        "href". If href is found then look for a hashmark (#) in its value. If
        found then extract the substring following the hashmark and seek this
        name in the Datatypes folder. If found then set m_pSecondary to the
        datatype object found; else create a new datatype with this name, and
        set m_pSecondary to the new datatype object.
      
      CCBUG:56184
      3ded4560
  15. 20 Apr, 2014 3 commits
    • Oliver Kellogg's avatar
      Initial work on loading UML2/XMI2 files, e.g. · c0d58b3b
      Oliver Kellogg authored
        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
      c0d58b3b
    • Oliver Kellogg's avatar
      umbrello/umldoc.h · a9d4efc3
      Oliver Kellogg authored
      - 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
      a9d4efc3
    • Oliver Kellogg's avatar