291749 2012-01-17 09:26:26 +0000 classes copy & paste bug in Tree View 2013-11-10 23:40:53 +0000 1 1 2 Applications umbrello general unspecified Unlisted Binaries All RESOLVED FIXED NOR normal --- 1 ralf.habacker kde kde okellogg ralf.habacker http://commits.kde.org/umbrello/c4de1a6c78e8f8435aeb5f4ba6477ffdeedbef3d 4.12.0 0 oldest_to_newest 1215445 0 ralf.habacker 2012-01-17 09:26:26 +0000 Version: unspecified (using Devel) OS: All Copy and paste of a class in the Logical view results into an entry below the original entry with the same name from which it has been copied. Below the original class entry there is a new entry with the same name, which seems to be a separate class (one can add attributes and operations independently from the original class). Reproducible: Always Steps to Reproduce: 1. Add a class to a class diagram 2. select the class in the tree view and press STRG-C then STRG-V Actual Results: When dragging this class onto a class diagram, a class with the original class name is shown. It is impossible to add the pasted class into a class diagram. Expected Results: The pasted class should be addable to the class diagram. 1395818 1 82215 kde 2013-09-08 10:06:11 +0000 Created attachment 82215 Fix copy-paste bugs and inconsistencies in tree view 1395819 2 kde 2013-09-08 10:06:43 +0000 The problem with copy-pasting in the tree view is not limited to the logical view. Also, different behaviour can be observed depending on the type of item copied and what item it's pasted on. Issue 1: Classes and interfaces act as containers in tree view Copy/paste of a class or interface on itself results in a nested hierarchy: -> Logical View ->-> new_class ->->-> new_class This container-like behaviour is only implemented in the tree view, and only when pasting the items on itself. I'll assume pasted classes and interfaces should always be siblings, never children (except when pasted on true containers like folders, packages, etc). Issue 2: Inconsistent rename behaviour When pasting an item (for example, an actor in a use case diagram) on itself, a new item is created with the exact same name. This is different from pasting on the container (the Use Case View in this example) where the rename dialog is shown. Issue 3: Unable to drag all items onto the diagram Either original or pasted items can be dragged onto the diagram, but not both. Attached patch fixes these three issues and a slightly related bug where categories could not be dragged onto ER models. 1395878 3 okellogg 2013-09-08 17:04:32 +0000 (In reply to comment #2) > The problem with copy-pasting in the tree view is not limited to the logical > view. Also, different behaviour can be observed depending on the type of item > copied and what item it's pasted on. > > Issue 1: Classes and interfaces act as containers in tree view > Copy/paste of a class or interface on itself results in a nested hierarchy: > -> Logical View > ->-> new_class > ->->-> new_class > This container-like behaviour is only implemented in the tree view, and only > when pasting the items on itself. I'll assume pasted classes and interfaces > should always be siblings, never children (except when pasted on true > containers like folders, packages, etc). Actually, years ago there had been enhancement requests to support nested classes, and the existing code was implementing that. Back in the old KDE3 days it did work - but some time later (most likely in the course of migrating to KDE4) it broke, and nobody has fixed it again. Thanks for your patch. 1396083 4 andi.fischer 2013-09-09 17:53:29 +0000 Git commit c63e77ca04b691b304a391d5b926ac0f0667e974 by Andi Fischer, on behalf of Joris Steyn. Committed on 08/09/2013 at 19:12. Pushed by fischer into branch 'master'. The problem with copy-pasting in the tree view is fixed. M +10 -5 umbrello/model_utils.cpp M +1 -0 umbrello/umlobject.cpp M +3 -1 umbrello/umlview.cpp http://commits.kde.org/umbrello/c63e77ca04b691b304a391d5b926ac0f0667e974 1401771 5 ralf.habacker 2013-10-06 12:21:07 +0000 Git commit c4de1a6c78e8f8435aeb5f4ba6477ffdeedbef3d by Ralf Habacker, on behalf of Joris Steyn. Committed on 08/09/2013 at 19:12. Pushed by habacker into branch 'KDE/4.11'. The problem with copy-pasting in the tree view is fixed. FIXED-IN:4.11.3 M +10 -5 umbrello/model_utils.cpp M +1 -0 umbrello/umlobject.cpp M +3 -1 umbrello/umlview.cpp http://commits.kde.org/umbrello/c4de1a6c78e8f8435aeb5f4ba6477ffdeedbef3d 1410432 6 kde 2013-11-10 19:20:34 +0000 Git commit 1bfad17b6e6891a316ea56ac906980175ae5a058 by Joris Steyn. Committed on 13/10/2013 at 15:09. Pushed by jorissteyn into branch 'master'. Fix copy/paste between Umbrello instances Clip4 now contains all the UMLObjects corresponding to the copied widgets. Some related but obviously unused code removed. Involves a better fix than c63e77c for broken copy/paste of listview items. Related: bug 70926, bug 279788, bug 195803, bug 128068 M +7 -48 umbrello/clipboard/umlclipboard.cpp M +18 -14 umbrello/clipboard/umldragdata.cpp M +6 -0 umbrello/uml.cpp M +0 -111 umbrello/umllistview.cpp M +0 -5 umbrello/umllistview.h M +1 -2 umbrello/umlobject.cpp http://commits.kde.org/umbrello/1bfad17b6e6891a316ea56ac906980175ae5a058 1410477 7 ralf.habacker 2013-11-10 23:40:53 +0000 Git commit 9b2d14372905fc49076025488983fb5859637eba by Ralf Habacker, on behalf of Joris Steyn. Committed on 13/10/2013 at 15:09. Pushed by habacker into branch 'KDE/4.12'. Fix copy/paste between Umbrello instances Clip4 now contains all the UMLObjects corresponding to the copied widgets. Some related but obviously unused code removed. Involves a better fix than c63e77c for broken copy/paste of listview items. Related: bug 70926, bug 279788, bug 195803, bug 128068 M +7 -48 umbrello/clipboard/umlclipboard.cpp M +18 -14 umbrello/clipboard/umldragdata.cpp M +6 -0 umbrello/uml.cpp M +0 -111 umbrello/umllistview.cpp M +0 -5 umbrello/umllistview.h M +1 -2 umbrello/umlobject.cpp http://commits.kde.org/umbrello/9b2d14372905fc49076025488983fb5859637eba 82215 2013-09-08 10:06:11 +0000 2013-09-08 10:06:11 +0000 Fix copy-paste bugs and inconsistencies in tree view umbrello-fix-copy-paste-in-tree-view-bug-291749.patch text/plain 2367 kde ZGlmZiAtLWdpdCBhL3VtYnJlbGxvL21vZGVsX3V0aWxzLmNwcCBiL3VtYnJlbGxvL21vZGVsX3V0 aWxzLmNwcAppbmRleCA2ZjQxNDgyLi42YjllMDg5IDEwMDY0NAotLS0gYS91bWJyZWxsby9tb2Rl bF91dGlscy5jcHAKKysrIGIvdW1icmVsbG8vbW9kZWxfdXRpbHMuY3BwCkBAIC0zODMsMjIgKzM4 MywyNyBAQCBVTUxPYmplY3QqIHRyZWVWaWV3R2V0Q3VycmVudE9iamVjdCgpCiAKIC8qKgogICog UmV0dXJuIHRoZSBVTUxQYWNrYWdlIGlmIHRoZSBjdXJyZW50IGl0ZW0KLSAqIGluIHRoZSB0cmVl IHZpZXcgaXMgYSBwYWNrYWdlLgorICogaW4gdGhlIHRyZWUgdmlldyBpcyBhIHBhY2thZ2UuIFJl dHVybiB0aGUKKyAqIGNsb3Nlc3QgcGFja2FnZSBpbiB0aGUgdHJlZSB2aWV3IG9yIE5VTEwgb3Ro ZXJ3aXNlCisgKgogICogQHJldHVybiAgIHRoZSBwYWNrYWdlIG9yIE5VTEwKICAqLwogVU1MUGFj a2FnZSogdHJlZVZpZXdHZXRQYWNrYWdlRnJvbUN1cnJlbnQoKQogewogICAgIFVNTExpc3RWaWV3 ICpsaXN0VmlldyA9IFVNTEFwcDo6YXBwKCktPmxpc3RWaWV3KCk7CiAgICAgVU1MTGlzdFZpZXdJ dGVtICpwYXJlbnRJdGVtID0gKFVNTExpc3RWaWV3SXRlbSopbGlzdFZpZXctPmN1cnJlbnRJdGVt KCk7Ci0gICAgaWYgKHBhcmVudEl0ZW0pIHsKKyAgICB3aGlsZSAocGFyZW50SXRlbSkgewogICAg ICAgICBVTUxMaXN0Vmlld0l0ZW06Okxpc3RWaWV3VHlwZSBsdnQgPSBwYXJlbnRJdGVtLT50eXBl KCk7Ci0gICAgICAgIGlmIChNb2RlbF9VdGlsczo6dHlwZUlzQ29udGFpbmVyKGx2dCkgfHwKLSAg ICAgICAgICAgIGx2dCA9PSBVTUxMaXN0Vmlld0l0ZW06Omx2dF9DbGFzcyB8fAotICAgICAgICAg ICAgbHZ0ID09IFVNTExpc3RWaWV3SXRlbTo6bHZ0X0ludGVyZmFjZSkgeworICAgICAgICBpZiAo TW9kZWxfVXRpbHM6OnR5cGVJc0NvbnRhaW5lcihsdnQpKSB7CiAgICAgICAgICAgICBVTUxPYmpl Y3QgKm8gPSBwYXJlbnRJdGVtLT51bWxPYmplY3QoKTsKICAgICAgICAgICAgIHJldHVybiBzdGF0 aWNfY2FzdDxVTUxQYWNrYWdlKj4obyk7CiAgICAgICAgIH0KKworICAgICAgICAvLyBzZWxlY3Rl ZCBpdGVtIGlzIG5vdCBhIGNvbnRhaW5lciwgdHJ5IHRvIGZpbmQgdGhlCisgICAgICAgIC8vIGNv bnRhaW5lciBoaWdoZXIgdXAgaW4gdGhlIHRyZWUgdmlldworICAgICAgICBwYXJlbnRJdGVtID0g c3RhdGljX2Nhc3Q8VU1MTGlzdFZpZXdJdGVtKj4ocGFyZW50SXRlbS0+cGFyZW50KCkpOwogICAg IH0KKwogICAgIHJldHVybiBOVUxMOwogfQogCmRpZmYgLS1naXQgYS91bWJyZWxsby91bWxvYmpl Y3QuY3BwIGIvdW1icmVsbG8vdW1sb2JqZWN0LmNwcAppbmRleCBjYzgzNDI3Li4zYzQ3ZDg5IDEw MDY0NAotLS0gYS91bWJyZWxsby91bWxvYmplY3QuY3BwCisrKyBiL3VtYnJlbGxvL3VtbG9iamVj dC5jcHAKQEAgLTEwNjgsNiArMTA2OCw3IEBAIGJvb2wgVU1MT2JqZWN0Ojpsb2FkRnJvbVhNSShR RG9tRWxlbWVudCAmIGVsZW1lbnQpCiAgICAgICAgIG1fQmFzZVR5cGUgIT0gb3RfRm9yZWlnbktl eUNvbnN0cmFpbnQpIHsKICAgICAgICAgaWYgKG1fYkluUGFzdGUpIHsKICAgICAgICAgICAgIG1f cFVNTFBhY2thZ2UgPSBNb2RlbF9VdGlsczo6dHJlZVZpZXdHZXRQYWNrYWdlRnJvbUN1cnJlbnQo KTsKKyAgICAgICAgICAgIHRoaXMtPnNldElEKFVuaXF1ZUlEOjpnZW4oKSk7CiAgICAgICAgIH0K ICAgICAgICAgaWYgKG1fcFVNTFBhY2thZ2UpIHsKICAgICAgICAgICAgIG1fcFVNTFBhY2thZ2Ut PmFkZE9iamVjdCh0aGlzKTsKZGlmZiAtLWdpdCBhL3VtYnJlbGxvL3VtbHZpZXcuY3BwIGIvdW1i cmVsbG8vdW1sdmlldy5jcHAKaW5kZXggYWI3Nzk5NC4uYjYyNDlmZiAxMDA2NDQKLS0tIGEvdW1i cmVsbG8vdW1sdmlldy5jcHAKKysrIGIvdW1icmVsbG8vdW1sdmlldy5jcHAKQEAgLTIzMSw3ICsy MzEsOSBAQCB2b2lkIFVNTFZpZXc6OmRyYWdFbnRlckV2ZW50KFFEcmFnRW50ZXJFdmVudCAqZSkK ICAgICAgICAgICAgICAgICBiQWNjZXB0ID0gZmFsc2U7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgY2FzZSBVbWw6OkRpYWdyYW1UeXBlOjpFbnRpdHlSZWxhdGlvbnNoaXA6Ci0gICAgICAg ICAgICBpZiAob3QgIT0gVU1MT2JqZWN0OjpvdF9FbnRpdHkpCisgICAgICAgICAgICBpZiAodW1s U2NlbmUoKS0+d2lkZ2V0T25EaWFncmFtKGlkKSB8fAorICAgICAgICAgICAgICAgIChvdCAhPSBV TUxPYmplY3Q6Om90X0VudGl0eSAmJgorICAgICAgICAgICAgICAgICBvdCAhPSBVTUxPYmplY3Q6 Om90X0NhdGVnb3J5KSkKICAgICAgICAgICAgICAgICBiQWNjZXB0ID0gZmFsc2U7CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoK