[ https://issues.apache.org/jira/browse/CAY-1826?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14172157#comment-14172157 ]
ASF GitHub Bot commented on CAY-1826: ------------------------------------- GitHub user thinline72 opened a pull request: https://github.com/apache/cayenne/pull/19 CAY-1826 | Merge Entity Attributes and Relationships tabs together Also we still have problems with Undo/Redo for Cut/Copy/Paste operations (this behavior predates the commit), so i'm going to continue working with that. You can merge this pull request into a Git repository by running: $ git pull https://github.com/thinline72/cayenne CAY-1826 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/19.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #19 ---- commit 0e69b90ed1236bcb8f978c1e85311b772f9531b5 Author: Savva Kolbechev <s.kolbac...@gmail.com> Date: 2014-10-14T12:43:40Z CAY-1826 | Merge Entity Attributes and Relationships tabs together with one toolbar. ---- > Merge Entity Attributes and Relationships tabs together with one toolbar. > ------------------------------------------------------------------------- > > Key: CAY-1826 > URL: https://issues.apache.org/jira/browse/CAY-1826 > Project: Cayenne > Issue Type: Improvement > Components: Modeler > Affects Versions: 3.2.M1 > Environment: Linux > Reporter: ArtyomN > Attachments: 1826new.txt, BeforeDbEntity.png, BeforeObjEntity.png, > ButtomEditRelatiionshipAfter.png, ButtomEditRelatioshipBefore.png, > OneTabOneToolbarDbEntity.png, OneTabOneToolbarObjEntity.png, patch.txt > > Original Estimate: 12h > Remaining Estimate: 12h > > For convenient display attributes and relationships, there were two tabs will > integrate ObjEntityAttributeTab and ObjEntityRelationshipTab one, > DbEntityAttributeTab and DbEntityRelationshipTab, using the new classes > ObjEntityAttrRelationshipTab and DbEntityAttrRelationshipTab. Now the toolbar > is formed in these new classes. That you can use one toolbar for attributes > and relationships were made new classes "mediators" > CopyAttrRelationshipsAction, CutAttrRelationshipsAction and > RemoveAttrRelationshipsAction. Was also been modified button "edit > relationships", which incorrectly became active. In the new patch renamed > classes ObjEntityAttributeTab, ObjEntityRelationshipTab, > DbEntityAttributeTab, DbEntityRelationshipTab in ObjEntityAttributePanel, > ObjEntityRelationshipPanel, DbEntityAttributePanel, > DbEntityRelationshipPanel, and in the "mediators" classes replaced static > "currentSelectedPanel" field. -- This message was sent by Atlassian JIRA (v6.3.4#6332)