From commits-return-23607-archive-asf-public=cust-asf.ponee.io@cayenne.apache.org Sat Jul 7 17:10:15 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 15CDF18067B for ; Sat, 7 Jul 2018 17:10:14 +0200 (CEST) Received: (qmail 20721 invoked by uid 500); 7 Jul 2018 15:10:14 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 20703 invoked by uid 99); 7 Jul 2018 15:10:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jul 2018 15:10:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 398E2E09EE; Sat, 7 Jul 2018 15:10:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntimofeev@apache.org To: commits@cayenne.apache.org Date: Sat, 07 Jul 2018 15:10:14 -0000 Message-Id: <9e4d6272b3a8487db5c16aa6212dbc2c@git.apache.org> In-Reply-To: <11aabf0f854541bfb45199834196f5f6@git.apache.org> References: <11aabf0f854541bfb45199834196f5f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cayenne git commit: Merge PR #295 Merge PR #295 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/54a97066 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/54a97066 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/54a97066 Branch: refs/heads/master Commit: 54a9706615b1478fbe9a407fa097a70c49f91620 Parents: e980ed1 e452059 Author: Nikita Timofeev Authored: Sat Jul 7 18:01:16 2018 +0300 Committer: Nikita Timofeev Committed: Sat Jul 7 18:01:16 2018 +0300 ---------------------------------------------------------------------- .../modeler/action/GenerateCodeAction.java | 30 +---- .../dialog/codegen/ClassesTabController.java | 104 +++++++++++++++--- .../modeler/dialog/codegen/ClassesTabPanel.java | 96 ++++++++++++---- .../dialog/codegen/ClientModeController.java | 24 ---- .../dialog/codegen/CodeGeneratorController.java | 18 ++- .../codegen/CodeGeneratorControllerBase.java | 110 ++++++++++++++++++- .../dialog/codegen/CodeGeneratorDialog.java | 28 +++-- .../dialog/codegen/CustomModeController.java | 65 +++-------- .../modeler/dialog/codegen/CustomModePanel.java | 59 +++------- .../dialog/codegen/GeneratorController.java | 62 ++++------- .../dialog/codegen/GeneratorTabController.java | 13 +-- .../dialog/codegen/StandardModeController.java | 26 ----- .../dialog/codegen/StandardModePanel.java | 18 +-- .../modeler/editor/SelectQueryPrefetchTab.java | 4 +- 14 files changed, 359 insertions(+), 298 deletions(-) ----------------------------------------------------------------------