1. 27 Apr, 2021 3 commits
  2. 25 Apr, 2021 1 commit
  3. 20 Apr, 2021 2 commits
  4. 14 Apr, 2021 1 commit
  5. 09 Apr, 2021 1 commit
  6. 05 Apr, 2021 2 commits
  7. 13 Mar, 2021 2 commits
  8. 03 Mar, 2021 2 commits
  9. 02 Mar, 2021 2 commits
  10. 09 Feb, 2021 2 commits
  11. 07 Feb, 2021 1 commit
  12. 17 Jan, 2021 2 commits
    • Oliver Kellogg's avatar
      In IDLWriter flesh out code generation for IDL union: · 1b35365e
      Oliver Kellogg authored
      umbrello/codegenerators/idl/idlwriter.cpp
      - In function writeClass, if `stype' contains "Union" then
        - retrieve the classifier's attributes into local `atl';
        - pop first attribute off front of `atl' into local `discrim' and
          generate the "switch" type using discrim;
        - iterate over the remaining elements of `atl' and handle tags on
          each element (the tags are used for storing the union case labels
          or the "default" label) before printing each attribute.
      - Additional change in function writeClass: On handling Typedef fix
        crash when superclass is not set.
      
      CCBUG: 81301
      1b35365e
    • Oliver Kellogg's avatar
      Small fixes for IDLImport: · 129ebb73
      Oliver Kellogg authored
      umbrello/codeimport/import_utils.cpp
      - In function createGeneralization(UMLClassifier*, UMLClassifier*), if
        child->umlPackage() is non null then
        - set UMLPackage of assoc to child->umlPackage();
        - add association at child instead of at Logical View.
      
      umbrello/codeimport/idlimport.cpp
      - In function skipStructure remove call to skipStmt().
        Reason: This is done by NativeImportBase::parseFile().
      - In function parseStmt handling of alias-typedef of non template type
        flesh out conveying of the existing type:
        - If oldType is found by m_doc->findUMLObject then use the returned
          UMLObject instead of creating a new one;
        - Create generalization from new classifier to existing classifier.
          Note that in case of alias-typedef of datatypes this does not show
          up yet in diagrams etc. because associations are not saved in class
          UMLDatatype. This is a TODO for future change.
               skipStmt();
               return true;
      - In function parseStmt handling of valuetype set the stereotype
        "idlValue" on m_klass.
      129ebb73
  13. 16 Jan, 2021 3 commits
  14. 15 Jan, 2021 1 commit
  15. 14 Jan, 2021 4 commits
    • Oliver Kellogg's avatar
      Flesh out bounded string / bounded sequence handling in IDL import: · 54e6c2d9
      Oliver Kellogg authored
      umbrello/codeimport/idlimport.h
      - Add member m_doc of type UMLDoc* for conventiently accessing
        UMLApp::app()->document().
      
      umbrello/codeimport/idlimport.cpp
      - In constructor initialize m_doc.
      - In function parseStmt keyword "typedef" handling of template types :
        - In case of «idlSequence» create newType as Class instead of as
          Datatype.  Reason: Umbrello does not currently support the menus and
          dialogs for adding/manipulating attributes of UMLDatatype.
        - Implement «idlSequence» / «idlString» stereotype attribute "bound"
          of type Uml::PrimitiveTypes::UnlimitedNatural.
          When applying «idlSequence», if the concrete tag value provided in
          UMLObject::tags() is empty then this means it is an unbounded
          sequence.
        - In case of «idlSequence» create an attribute "members" on newType.
          The type of the attribute is the origin type of the typedef (i.e.
          oldType).
        - Set the calculated stereotype on the newType object.
        - Append the extracted bound onto the tags() of the new type object.
      
      CCBUG: 81301
      54e6c2d9
    • Oliver Kellogg's avatar
      - Merge release/20.12 @ d5b467cb to master for crash fix in umlscene.cpp · 4c2586ff
      Oliver Kellogg authored
      - In CMakeLists.txt preserve RELEASE_SERVICE_VERSION 21.03.70
      4c2586ff
    • Oliver Kellogg's avatar
      Change StereotypesModel member m_stereotypes from pointer to reference: · 959be508
      Oliver Kellogg authored
      umbrello/models/stereotypesmodel.h
      - Change member m_stereotypes from pointer to reference.
      - At constructor change UMLStereotypeList argument from pointer to
        reference.
      
      umbrello/models/stereotypesmodel.cpp
      - Adjust code manipulating m_stereotypes to the above change.
      - In function addStereotype, if the passed in pointer is not found in
        m_stereotypes then compare the passed in stereotype's name to the
        names in m_stereotypes. If a match is found then do not add the
        pointer passed in.
      - In function removeStereotype, if the passed in pointer is not found in
        m_stereotypes then compare the passed in stereotype's name to the
        names in m_stereotypes:
        - If no match is found then return false without attempting removal.
        - If a match is found then remove the matching pointer.
      
      umbrello/umldoc.cpp
      - In constructor, on initializing m_stereotypesModel pass m_stereoList
        to constructor of StereotypesModel by reference instead of address.
      959be508
    • Oliver Kellogg's avatar
      Fixes for commit c7fdfefc saving of tagged values to XMI: · d6ff4174
      Oliver Kellogg authored
      umbrello/uml1model/stereotype.cpp
      - In function saveToXMI1 case !m_attrDefs.isEmpty() loop over m_attrDefs
        call writer.writeEndElement() to close the opened <UML:Attribute>.
      
      umbrello/uml1model/umlobject.cpp
      - In function save1end case m_TaggedValues.count(), after end of loop
        over m_TaggedValues call writer.writeEndElement() to close the opened
        <UML:ModelElement.taggedValues>.
      
      CCBUG: 73847
      d6ff4174
  16. 11 Jan, 2021 3 commits
    • Oliver Kellogg's avatar
      Progress on IDL import: · 3388653c
      Oliver Kellogg authored
      umbrello/codeimport/idlimport.{h,cpp}
      - New function skipStructure skips to the end of a struct/union/
        valuetype/interface declaration.
      - New function isValidScopedName returns true if the argument conforms
        to IDL syntax for scoped names.
      - For processing unions add members m_isUnionDefault of type bool and
        m_unionCases of type QStringList.
      
      umbrello/codeimport/idlimport.cpp
      - In function fillSource remove compressing of sequence or bounded
        string into single lexeme.
      - In function parseStmt,
        - extend documentation;
        - make local `keyword' non const;
        - on setting stereotypes use prefix "idl" in lieu of "CORBA" for
          compatibility with IDL4;
        - start fleshing out union handling;
        - on handling "typedef" start fleshing out sequence and bounded
          string.
      
      CCBUG: 81301
      3388653c
    • Oliver Kellogg's avatar
      umbrello/codeimport/import_utils.h · 49f2e524
      Oliver Kellogg authored
      - At function insertAttribute activate default value of arguments
        `comment' and `isStatic'.
      49f2e524
    • Oliver Kellogg's avatar
      umbrello/codegenerators/idl/idlwriter.cpp · 82048c57
      Oliver Kellogg authored
      - In functions isOOClass and writeClass, on comparing against known
        stereotypes accept stereotype prefixes other than "CORBA".
        Reason: IDL v4 separates the language from CORBA. Several known tools
        use stereotypes prefixed with "idl" instead of "CORBA".
      - In function defaultDatatypes add missing types "long long",
        "unsigned long long", "long double".
      
      CCBUG: 81301
      82048c57
  17. 09 Jan, 2021 1 commit
  18. 08 Jan, 2021 5 commits
    • Oliver Kellogg's avatar
      Fix misplacement of startpoint on associationline originating at port: · 2d1468b2
      Oliver Kellogg authored
      umbrello/umlwidgets/umlwidget.{h,cpp}
      - Add virtual functions getX / getY returning qreal and getPos returning
        QPointF.  Default implementation calls QGraphicsObjectWrapper
        functions x() / y() / pos().
      
      umbrello/umlwidgets/pinportbase.{h,cpp}
      - Reimplement virtual functions getX / getY and getPos.
        They call the respective function of UMLWidget but add the respective
        component of parentItem() (i.e. x(), y(), pos() resp.)
        Reason: PinPortBase coordinates are relative to their ComponentWidget.
      
      umbrello/toolbarstateassociation.cpp
      - In function setSecondWidget, after creating the AssociationWidget
        check whether widgetA is a PortWidget. If it is then
        - store widgetA->getPos() to local variable lineStart;
        - set the startpoint of the association line to lineStart.
      
      umbrello/umlwidgets/associationwidget.cpp
      - Use new UMLWidget functions getX / getY / getPos in all code that is
        related to association line calculation and update:
        Function calculateEndingPoints, doUpdates, updateRegionLineCount.
      
      CCBUG: 403692
      2d1468b2
    • Oliver Kellogg's avatar
    • Oliver Kellogg's avatar
      umbrello/umlwidgets/widgetbase.cpp · 8d102f68
      Oliver Kellogg authored
      - Update copyright year.
      
      umbrello/umlwidgets/widget_factory.cpp
      - In function makeWidgetFromXMI loading of widgets which represent a
        UMLObject, if the UML object cannot be found then change the message
        from Debug to Error and return null pointer.
        Reason: Umbrello currently cannot handle forward references in the XMI
        of diagram objects.
      8d102f68
    • Oliver Kellogg's avatar
      umbrello/umlwidgets/widgetbase.cpp · 3f9155fd
      Oliver Kellogg authored
      - In function QGraphicsObjectWrapper::setSelected address gcc warning
        suggesting parentheses to avoid ambiguous else-part.
      - At function widgetHasUMLObject fix documentation.
      3f9155fd
    • Oliver Kellogg's avatar
      umbrello/assocrules.cpp diagnostics improvement: · bdea7bc1
      Oliver Kellogg authored
      - In function allowAssociation add debug messages giving the reason for
        returning false.
      bdea7bc1
  19. 07 Jan, 2021 2 commits