Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 58A10200CC5 for ; Tue, 11 Jul 2017 19:55:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5749A166B0B; Tue, 11 Jul 2017 17:55:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9DD30166B0F for ; Tue, 11 Jul 2017 19:55:12 +0200 (CEST) Received: (qmail 8743 invoked by uid 500); 11 Jul 2017 17:54:54 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 3273 invoked by uid 99); 11 Jul 2017 17:54:49 -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; Tue, 11 Jul 2017 17:54:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 94DBEF5541; Tue, 11 Jul 2017 17:54:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chtompki@apache.org To: commits@commons.apache.org Date: Tue, 11 Jul 2017 17:55:53 -0000 Message-Id: <6abefb04a0e7407694924753c26696da@git.apache.org> In-Reply-To: <73d6ee8e3b69428ca7266b5410a6494f@git.apache.org> References: <73d6ee8e3b69428ca7266b5410a6494f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [68/77] [abbrv] commons-collections git commit: finish extraction of abstract class archived-at: Tue, 11 Jul 2017 17:55:13 -0000 finish extraction of abstract class git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/collections_jdk5_branch@814061 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/c673ab5f Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/c673ab5f Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/c673ab5f Branch: refs/heads/collections_jdk5_branch Commit: c673ab5f4e38463fe210eb141678206904f39505 Parents: bb91d00 Author: Matthew Jason Benson Authored: Fri Sep 11 22:22:41 2009 +0000 Committer: Matthew Jason Benson Committed: Fri Sep 11 22:22:41 2009 +0000 ---------------------------------------------------------------------- .../commons/collections/splitmap/TransformedMap.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/c673ab5f/src/java/org/apache/commons/collections/splitmap/TransformedMap.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/commons/collections/splitmap/TransformedMap.java b/src/java/org/apache/commons/collections/splitmap/TransformedMap.java index 88e309c..67a515f 100644 --- a/src/java/org/apache/commons/collections/splitmap/TransformedMap.java +++ b/src/java/org/apache/commons/collections/splitmap/TransformedMap.java @@ -66,8 +66,6 @@ public class TransformedMap extends AbstractIterableGetMapDecorator< /** Serialization version */ private static final long serialVersionUID = 5966875321133456994L; - /** The decorated map */ - private Map decorated; /** The transformer to use for the key */ private final Transformer keyTransformer; /** The transformer to use for the value */ @@ -128,7 +126,7 @@ public class TransformedMap extends AbstractIterableGetMapDecorator< */ private void writeObject(ObjectOutputStream out) throws IOException { out.defaultWriteObject(); - out.writeObject(decorated); + out.writeObject(decorated()); } /** @@ -142,7 +140,7 @@ public class TransformedMap extends AbstractIterableGetMapDecorator< @SuppressWarnings("unchecked") private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); - decorated = (Map) in.readObject(); + map = (Map) in.readObject(); } //----------------------------------------------------------------------- @@ -216,5 +214,10 @@ public class TransformedMap extends AbstractIterableGetMapDecorator< decorated().putAll(transformMap(mapToCopy)); } - + /** + * {@inheritDoc} + */ + public void clear() { + decorated().clear(); + } }