136061 2006-10-20 23:44:15 +0000 JJ: xml scheme: mixup of attribute names: *color and *colour 2006-12-27 10:08:21 +0000 1 1 2 Applications umbrello general unspecified unspecified Linux RESOLVED FIXED NOR wishlist --- 1 mail umbrello-devel 0 oldest_to_newest 478639 0 mail 2006-10-20 23:44:15 +0000 Version: 1.5.3 (using KDE 3.5.5, Debian Package 4:3.5.5a-1 (testing/unstable)) Compiler: Target: i486-linux-gnu OS: Linux (i686) release 2.6.17-2-486 Would't it not be clearer to either use *color or *colour as attribute names of the diagram and widget elemens in the xml scheme? BE: classwidget/usesdiagramfillcolour classwidget/usesdiagramusefillcolour classwidget/fillcolour interfacewidget/usesdiagramfillcolour interfacewidget/usesdiagramusefillcolour interfacewidget/fillcolour AE: diagram/fillcolor diagram/usefillcolor diagram/linecolor classwidget/usefillcolor classwidget/linecolor interfacewidget/usefillcolor interfacewidget/linecolor 488368 1 okellogg 2006-11-20 21:11:25 +0000 Easy enough for Junior Job. Caveat: Need to continue to support loading files containing the "ou" spelling for backward compatibility. 495656 2 19019 mpalomas 2006-12-23 18:56:34 +0000 Created attachment 19019 Mixup spelling in xml scheme proposed patch Hello, here is my proposed patch for this bug (KDE 3.5 svn branch). Changed *colour to *color in UMLWidget::saveToXMI , and in loadFromXMI first try to retrieve old british spelling to keep backward compatibility, then try with the american one . Tested on very simple project file (2 classes with colors changed) which used the old mixup scheme, loaded correctly, then saved again, .xmi is then consistent with only *color as expected. I hope i did not miss more *colour attributes in other source files. Cheers, Michael 496206 3 okellogg 2006-12-27 10:08:20 +0000 SVN commit 616890 by okellogg: Apply attachment 19019 from Michael Palomas: > Changed *colour to *color in UMLWidget::saveToXMI, and in loadFromXMI first > try to retrieve old british spelling to keep backward compatibility, then > try with the american one. BUG:136061 M +1 -0 ChangeLog M +13 -4 umbrello/umlwidget.cpp --- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #616889:616890 @@ -15,6 +15,7 @@ * Association line nodes don't drag along with multiply-selected classes (57878) * Disappearing parameters when editing class properties (114477) * Umbrello saves too much copies at xmi (135606) +* XML scheme: mixup of attribute names: *color and *colour (136061) * Artifacts of a component diagram are wrongly placed in Deployment View folder (137564) * Incorrect export to SQL (138139) --- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlwidget.cpp #616889:616890 @@ -949,12 +949,13 @@ qElement.setAttribute( "y", getY() ); qElement.setAttribute( "width", getWidth() ); qElement.setAttribute( "height", getHeight() ); - qElement.setAttribute( "usesdiagramfillcolour", m_bUsesDiagramFillColour ); - qElement.setAttribute( "usesdiagramusefillcolour", m_bUsesDiagramUseFillColour ); + // for consistency the following attributes now use american spelling for "color" + qElement.setAttribute( "usesdiagramfillcolor", m_bUsesDiagramFillColour ); + qElement.setAttribute( "usesdiagramusefillcolor", m_bUsesDiagramUseFillColour ); if (m_bUsesDiagramFillColour) { - qElement.setAttribute( "fillcolour", "none" ); + qElement.setAttribute( "fillcolor", "none" ); } else { - qElement.setAttribute( "fillcolour", m_FillColour.name() ); + qElement.setAttribute( "fillcolor", m_FillColour.name() ); } qElement.setAttribute("isinstance", m_bIsInstance); if (!m_instanceName.isEmpty()) @@ -972,9 +973,17 @@ QString y = qElement.attribute( "y", "0" ); QString h = qElement.attribute( "height", "0" ); QString w = qElement.attribute( "width", "0" ); + /* + For the next three *color attributes, there was a mixup of american and english spelling for "color". + So first we need to keep backward compatibility and try to retrieve the *colour attribute. + Next we overwrite this value if we find a *color, otherwise the former *colour is kept. + */ QString fillColour = qElement.attribute( "fillcolour", "none" ); + fillColour = qElement.attribute( "fillcolor", fillColour ); QString usesDiagramFillColour = qElement.attribute( "usesdiagramfillcolour", "1" ); + usesDiagramFillColour = qElement.attribute( "usesdiagramfillcolor", usesDiagramFillColour ); QString usesDiagramUseFillColour = qElement.attribute( "usesdiagramusefillcolour", "1" ); + usesDiagramUseFillColour = qElement.attribute( "usesdiagramusefillcolor", usesDiagramUseFillColour ); m_nId = STR2ID(id); 19019 2006-12-23 18:56:34 +0000 2006-12-23 18:56:34 +0000 Mixup spelling in xml scheme proposed patch umbrello_bug_136061.diff text/plain 2226 mpalomas SW5kZXg6IHVtYnJlbGxvL3VtbHdpZGdldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdW1icmVsbG8vdW1s d2lkZ2V0LmNwcAkocul2aXNpb24gNjE1OTYxKQorKysgdW1icmVsbG8vdW1sd2lkZ2V0LmNwcAko Y29waWUgZGUgdHJhdmFpbCkKQEAgLTk0OSwxMiArOTQ5LDEzIEBACiAgICAgcUVsZW1lbnQuc2V0 QXR0cmlidXRlKCAieSIsIGdldFkoKSApOwogICAgIHFFbGVtZW50LnNldEF0dHJpYnV0ZSggIndp ZHRoIiwgZ2V0V2lkdGgoKSApOwogICAgIHFFbGVtZW50LnNldEF0dHJpYnV0ZSggImhlaWdodCIs IGdldEhlaWdodCgpICk7Ci0gICAgcUVsZW1lbnQuc2V0QXR0cmlidXRlKCAidXNlc2RpYWdyYW1m aWxsY29sb3VyIiwgbV9iVXNlc0RpYWdyYW1GaWxsQ29sb3VyICk7Ci0gICAgcUVsZW1lbnQuc2V0 QXR0cmlidXRlKCAidXNlc2RpYWdyYW11c2VmaWxsY29sb3VyIiwgbV9iVXNlc0RpYWdyYW1Vc2VG aWxsQ29sb3VyICk7CisgICAgLy8gZm9yIGNvbnNpc3RlbmN5IHRoZSBmb2xsb3dpbmcgYXR0cmli dXRlcyBub3cgdXNlIGFtZXJpY2FuIHNwZWxsaW5nIGZvciAiY29sb3IiCisgICAgcUVsZW1lbnQu c2V0QXR0cmlidXRlKCAidXNlc2RpYWdyYW1maWxsY29sb3IiLCBtX2JVc2VzRGlhZ3JhbUZpbGxD b2xvdXIgKTsKKyAgICBxRWxlbWVudC5zZXRBdHRyaWJ1dGUoICJ1c2VzZGlhZ3JhbXVzZWZpbGxj b2xvciIsIG1fYlVzZXNEaWFncmFtVXNlRmlsbENvbG91ciApOwogICAgIGlmIChtX2JVc2VzRGlh Z3JhbUZpbGxDb2xvdXIpIHsKLSAgICAgICAgcUVsZW1lbnQuc2V0QXR0cmlidXRlKCAiZmlsbGNv bG91ciIsICJub25lIiApOworICAgICAgICBxRWxlbWVudC5zZXRBdHRyaWJ1dGUoICJmaWxsY29s b3IiLCAibm9uZSIgKTsKICAgICB9IGVsc2UgewotICAgICAgICBxRWxlbWVudC5zZXRBdHRyaWJ1 dGUoICJmaWxsY29sb3VyIiwgbV9GaWxsQ29sb3VyLm5hbWUoKSApOworICAgICAgICBxRWxlbWVu dC5zZXRBdHRyaWJ1dGUoICJmaWxsY29sb3IiLCBtX0ZpbGxDb2xvdXIubmFtZSgpICk7CiAgICAg fQogICAgIHFFbGVtZW50LnNldEF0dHJpYnV0ZSgiaXNpbnN0YW5jZSIsIG1fYklzSW5zdGFuY2Up OwogICAgIGlmICghbV9pbnN0YW5jZU5hbWUuaXNFbXB0eSgpKQpAQCAtOTcyLDkgKzk3MywxNyBA QAogICAgIFFTdHJpbmcgeSA9IHFFbGVtZW50LmF0dHJpYnV0ZSggInkiLCAiMCIgKTsKICAgICBR U3RyaW5nIGggPSBxRWxlbWVudC5hdHRyaWJ1dGUoICJoZWlnaHQiLCAiMCIgKTsKICAgICBRU3Ry aW5nIHcgPSBxRWxlbWVudC5hdHRyaWJ1dGUoICJ3aWR0aCIsICIwIiApOworICAgIC8qCisgICAg ICBGb3IgdGhlIG5leHQgdGhyZWUgKmNvbG9yIGF0dHJpYnV0ZXMsIHRoZXJlIHdhcyBhIG1peHVw IG9mIGFtZXJpY2FuIGFuZCBlbmdsaXNoIHNwZWxsaW5nIGZvciAiY29sb3IiLgorICAgICAgU28g Zmlyc3Qgd2UgbmVlZCB0byBrZWVwIGJhY2t3YXJkIGNvbXBhdGliaWxpdHkgYW5kIHRyeSB0byBy ZXRyaWV2ZSB0aGUgKmNvbG91ciBhdHRyaWJ1dGUuCisgICAgICBOZXh0IHdlIG92ZXJ3cml0ZSB0 aGlzIHZhbHVlIGlmIHdlIGZpbmQgYSAqY29sb3IsIG90aGVyd2lzZSB0aGUgZm9ybWVyICpjb2xv dXIgaXMga2VwdC4KKyAgICAqLwogICAgIFFTdHJpbmcgZmlsbENvbG91ciA9IHFFbGVtZW50LmF0 dHJpYnV0ZSggImZpbGxjb2xvdXIiLCAibm9uZSIgKTsKKyAgICBmaWxsQ29sb3VyID0gcUVsZW1l bnQuYXR0cmlidXRlKCAiZmlsbGNvbG9yIiwgZmlsbENvbG91ciApOwogICAgIFFTdHJpbmcgdXNl c0RpYWdyYW1GaWxsQ29sb3VyID0gcUVsZW1lbnQuYXR0cmlidXRlKCAidXNlc2RpYWdyYW1maWxs Y29sb3VyIiwgIjEiICk7CisgICAgdXNlc0RpYWdyYW1GaWxsQ29sb3VyID0gcUVsZW1lbnQuYXR0 cmlidXRlKCAidXNlc2RpYWdyYW1maWxsY29sb3IiLCB1c2VzRGlhZ3JhbUZpbGxDb2xvdXIgKTsK ICAgICBRU3RyaW5nIHVzZXNEaWFncmFtVXNlRmlsbENvbG91ciA9IHFFbGVtZW50LmF0dHJpYnV0 ZSggInVzZXNkaWFncmFtdXNlZmlsbGNvbG91ciIsICIxIiApOworICAgIHVzZXNEaWFncmFtVXNl RmlsbENvbG91ciA9IHFFbGVtZW50LmF0dHJpYnV0ZSggInVzZXNkaWFncmFtdXNlZmlsbGNvbG9y IiwgdXNlc0RpYWdyYW1Vc2VGaWxsQ29sb3VyICk7CiAKICAgICBtX25JZCA9IFNUUjJJRChpZCk7 CiAK