[
https://issues.apache.org/jira/browse/CAY-1826?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13708773#comment-13708773
]
Andrus Adamchik commented on CAY-1826:
--------------------------------------
having trouble applying this to trunk. I suspect some preceding patch is
missing:
~/work/cayenne/modeler/cayenne-modeler: git apply -p0 ~/Desktop/patch.txt
/Users/cayenne/Desktop/patch.txt:19: trailing whitespace.
/Users/cayenne/Desktop/patch.txt:24: trailing whitespace.
/Users/cayenne/Desktop/patch.txt:25: trailing whitespace.
/Users/cayenne/Desktop/patch.txt:31: trailing whitespace.
/Users/cayenne/Desktop/patch.txt:35: trailing whitespace.
error:
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java:
No such file or directory
error:
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java:
No such file or directory
error: patch failed:
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTabbedView.java:83
error:
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTabbedView.java:
patch does not apply
error:
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributePanel.java:
No such file or directory
error:
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java:
No such file or directory
error: patch failed:
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTabbedView.java:150
error:
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTabbedView.java:
patch does not apply
> 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.2M1
> Environment: Linux
> Reporter: ArtyomN
> Attachments: 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 is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
