[ https://issues.apache.org/jira/browse/CAY-2172?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15750887#comment-15750887 ]
ASF GitHub Bot commented on CAY-2172: ------------------------------------- GitHub user stariy95 opened a pull request: https://github.com/apache/cayenne/pull/157 CAY-2172 Clean up Migrate and Reengineer database schema actions in Modeler - split DB actions to different packages - clean up ReverseEngineeringAction - clean up DataSource select dialogs - unify logic of Merge and ReverseEngineer actions - exclude table settings in reverse engineering dialog You can merge this pull request into a Git repository by running: $ git pull https://github.com/stariy95/cayenne CAY-2172 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/157.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 #157 ---- commit 7da0e8975da0eb266962ade0162f245b5dbc4978 Author: Nikita Timofeev <stari...@gmail.com> Date: 2016-12-13T15:15:02Z CAY-2172 Split DB actions to different packages Clean up ReverseEngineeringAction Clean up DataSource select dialogs commit 190ab7c7b72eb846ed39c7c80e4fa9a51046adf1 Author: Nikita Timofeev <stari...@gmail.com> Date: 2016-12-14T07:56:59Z Unify logic of Merge and ReverseEngineer actions commit 391c564be288412898c3861bc08305fabb1403b8 Author: stariy <stari...@gmail.com> Date: 2016-12-14T19:47:27Z Merge branch 'master' into CAY-2172 # Conflicts: # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MigrateAction.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbImportAction.java commit 163a871542e1cd54c929961cdc52f6fdf6a477ac Author: stariy <stari...@gmail.com> Date: 2016-12-14T19:50:00Z Merge branch 'master' into CAY-2172 # Conflicts: # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MigrateAction.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbImportAction.java commit 06c918302310430952ea145d2f046d0210b6dc19 Author: Nikita Timofeev <stari...@gmail.com> Date: 2016-12-15T09:10:00Z Exclude table settings in reverse engineering dialog Added @since tag to new public classes commit a1f10f42e9da3fe7df3c91c14536a25526f3c691 Author: Nikita Timofeev <stari...@gmail.com> Date: 2016-12-15T09:11:25Z Merge with master ---- > Cleanup Modeler import and migrate db actions > --------------------------------------------- > > Key: CAY-2172 > URL: https://issues.apache.org/jira/browse/CAY-2172 > Project: Cayenne > Issue Type: Sub-task > Components: Modeler, Non-GUI Tools > Reporter: Nikita Timofeev > Assignee: Nikita Timofeev > -- This message was sent by Atlassian JIRA (v6.3.4#6332)