From commits-return-23700-archive-asf-public=cust-asf.ponee.io@cayenne.apache.org Fri Jul 13 14:43:40 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 37C35180626 for ; Fri, 13 Jul 2018 14:43:40 +0200 (CEST) Received: (qmail 54263 invoked by uid 500); 13 Jul 2018 12:43:39 -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 54254 invoked by uid 99); 13 Jul 2018 12:43:39 -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; Fri, 13 Jul 2018 12:43:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 34B57DFC42; Fri, 13 Jul 2018 12:43:39 +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 Message-Id: <0aa8048e086f498995c03dfc6d8d1a2c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cayenne git commit: Code cleanup Date: Fri, 13 Jul 2018 12:43:39 +0000 (UTC) Repository: cayenne Updated Branches: refs/heads/master 90a0fd48b -> 2b88aa230 Code cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2b88aa23 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2b88aa23 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2b88aa23 Branch: refs/heads/master Commit: 2b88aa230c70d2a6e770992f8b2bdf0f12ff3ecb Parents: 90a0fd4 Author: Nikita Timofeev Authored: Fri Jul 13 15:43:33 2018 +0300 Committer: Nikita Timofeev Committed: Fri Jul 13 15:43:33 2018 +0300 ---------------------------------------------------------------------- .../apache/cayenne/project/ConfigurationSaver.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/2b88aa23/cayenne-project/src/main/java/org/apache/cayenne/project/ConfigurationSaver.java ---------------------------------------------------------------------- diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/ConfigurationSaver.java b/cayenne-project/src/main/java/org/apache/cayenne/project/ConfigurationSaver.java index 1aab516..6546856 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/ConfigurationSaver.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/ConfigurationSaver.java @@ -19,13 +19,13 @@ package org.apache.cayenne.project; import java.io.PrintWriter; -import java.util.Collection; import org.apache.cayenne.configuration.BaseConfigurationNodeVisitor; import org.apache.cayenne.configuration.DataChannelDescriptor; import org.apache.cayenne.map.DataMap; import org.apache.cayenne.project.extension.SaverDelegate; import org.apache.cayenne.util.XMLEncoder; +import org.apache.cayenne.util.XMLSerializable; /** * @since 3.1 @@ -44,23 +44,20 @@ class ConfigurationSaver extends BaseConfigurationNodeVisitor { @Override public Void visitDataChannelDescriptor(DataChannelDescriptor node) { - XMLEncoder encoder = new XMLEncoder(printWriter, "\t", version); - printXMLHeader(encoder); - delegate.setXMLEncoder(encoder); - node.encodeAsXML(encoder, delegate); + encodeNode(node); return null; } @Override public Void visitDataMap(DataMap node) { - XMLEncoder encoder = new XMLEncoder(printWriter, "\t", version); - printXMLHeader(encoder); - delegate.setXMLEncoder(encoder); - node.encodeAsXML(encoder, delegate); + encodeNode(node); return null; } - private void printXMLHeader(XMLEncoder encoder) { + private void encodeNode(XMLSerializable node) { + XMLEncoder encoder = new XMLEncoder(printWriter, "\t", version); encoder.println(""); + delegate.setXMLEncoder(encoder); + node.encodeAsXML(encoder, delegate); } }