[umbrello] [Bug 409411] Export to XHTML generates empy html file

https://bugs.kde.org/show_bug.cgi?id=409411

Oliver Kellogg <[email protected]> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|REOPENED                    |RESOLVED
         Resolution|---                         |FIXED
      Latest Commit|https://invent.kde.org/sdk/ |https://invent.kde.org/sdk/
                   |umbrello/commit/de636719fdf |umbrello/commit/e1b1b501dc3
                   |c7245f5498ae9717cf4462dfaa0 |14d33d0b0c677f3a655d09d7863
                   |1d                          |e5

--- Comment #5 from Oliver Kellogg <[email protected]> ---
Git commit e1b1b501dc314d33d0b0c677f3a655d09d7863e5 by Oliver Kellogg.
Committed on 06/03/2022 at 07:54.
Pushed by okellogg into branch 'master'.

Address reopening https://bugs.kde.org/show_bug.cgi?id=409411#c4

> > The sections "actors", "usecases", "interfaces", "classes" in the
> > generated docbook continue to be empty after that change: [...]
>
> This problem is fixed in the UML1 mode but in UML2 mode it persists.

umbrello/docgenerators/xmi1docbook.xsl
- Copy from xmi2docbook.xsl for use in UML1 mode.
- In <xsl:template name="actor"> <xsl:for-each> fix "select" expression.
- In <xsl:template name="usecase"> <xsl:for-each> fix "select" expr.

umbrello/docgenerators/xmi2docbook.xsl - adaptation to UML2 mode:
- In <xsl:stylesheet> replace
    xmlns:UML="http://schema.omg.org/spec/UML/1.4"
    exclude-result-prefixes="UML"
  by
    xmlns:xmi="http://schema.omg.org/spec/XMI/2.1"
    xmlns:uml="http://schema.omg.org/spec/UML/2.1"
    exclude-result-prefixes="uml"
- In all <xsl:key> replace use="@xmi.id" by use="@xmi:id".
- In all <xsl:template>,
  - change namespace prefix "UML:" to "uml:".
  - replace select="@xmi.id" by select="@xmi:id";
  - change UML:Actor to packagedElement[@xmi:type = 'uml:Actor'];
  - change UML:UseCase to packagedElement[@xmi:type = 'uml:UseCase'];
  - change UML:Interface to packagedElement[@xmi:type ='uml:Interface'];
  - change UML:Class to packagedElement[@xmi:type = 'uml:Class'];
  - change UML:Generalization to generalization;
  - change UML:Classifier.feature/UML:Operation to ownedOperation;
  - change UML:Classifier.feature/UML:Attribute to ownedAttribute;
  - change UML:Attribute to ownedAttribute;
  - change UML:Operation to ownedOperation;
  - change UML:BehavioralFeature.parameter/UML:Parameter to
    ownedParameter;
  - change UML:Parameter to ownedParameter.

umbrello/docgenerators/docbookgenerator.cpp
- In function customXslFile set xslBaseName to "xmi1docbook.xsl" if
  Settings::optionState().generalState.uml2 is false.

umbrello/umldoc.cpp
- In function saveToXMI case Settings::optionState().generalState.uml2
  add writing of attribute "uml" with value
  "http://schema.omg.org/spec/UML/2.1".
- In function loadFromXMI, if outerTag is "XMI" or "xmi:XMI" and
  versionString is "xmi.version" then set
  Settings::optionState().generalState.uml2 true if version is greater
  than or equal to 2.0.

umbrello/docgenerators/CMakeLists.txt
- In install FILES add xmi1docbook.xsl.

umbrello/version.h
- Increment XMI2_FILE_VERSION to "2.0.4" due to <xmi:XMI> added writing
  of attribute "xmlns:uml" (see UMLDoc::saveToXMI).
FIXED-IN: 2.33.80 (KDE releases 22.03.80)

M  +1    -0    umbrello/docgenerators/CMakeLists.txt
M  +7    -1    umbrello/docgenerators/docbookgenerator.cpp
C  +2    -2    umbrello/docgenerators/xmi1docbook.xsl [from:
umbrello/docgenerators/xmi2docbook.xsl - 099% similarity]
M  +60   -61   umbrello/docgenerators/xmi2docbook.xsl
M  +4    -0    umbrello/umldoc.cpp
M  +1    -1    umbrello/version.h

https://invent.kde.org/sdk/umbrello/commit/e1b1b501dc314d33d0b0c677f3a655d09d7863e5

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