Return-Path: 
 <dev-return-37775-apmail-harmony-dev-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-dev-archive@www.apache.org
Received: (qmail 81169 invoked from network); 28 Jul 2009 17:55:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 28 Jul 2009 17:55:50 -0000
Received: (qmail 70155 invoked by uid 500); 28 Jul 2009 17:57:07 -0000
Delivered-To: apmail-harmony-dev-archive@harmony.apache.org
Received: (qmail 70094 invoked by uid 500); 28 Jul 2009 17:57:07 -0000
Mailing-List: contact dev-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@harmony.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@harmony.apache.org>
List-Post: <mailto:dev@harmony.apache.org>
List-Id: <dev.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list dev@harmony.apache.org
Received: (qmail 70083 invoked by uid 99); 28 Jul 2009 17:57:07 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jul 2009 17:57:07 +0000
X-ASF-Spam-Status: No, hits=-2.8 required=10.0
	tests=RCVD_IN_DNSWL_MED,SPF_NEUTRAL
X-Spam-Check-By: apache.org
Received-SPF: neutral (athena.apache.org: 195.212.17.161 is neither permitted
 nor denied by domain of mark.hindess@googlemail.com)
Received: from [195.212.17.161] (HELO mtagate1.de.ibm.com) (195.212.17.161)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jul 2009 17:56:56 +0000
Received: from d12nrmr1607.megacenter.de.ibm.com
 (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49])
	by mtagate1.de.ibm.com (8.13.1/8.13.1) with ESMTP id n6SHuZRd004194
	for <dev@harmony.apache.org>; Tue, 28 Jul 2009 17:56:35 GMT
Received: from d12av01.megacenter.de.ibm.com (d12av01.megacenter.de.ibm.com
 [9.149.165.212])
	by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id
 n6SHuXBP2515180
	for <dev@harmony.apache.org>; Tue, 28 Jul 2009 19:56:35 +0200
Received: from d12av01.megacenter.de.ibm.com (loopback [127.0.0.1])
	by d12av01.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id
 n6SHuWON015051
	for <dev@harmony.apache.org>; Tue, 28 Jul 2009 19:56:32 +0200
Received: from anaheim.local (sig-9-145-196-150.de.ibm.com [9.145.196.150])
	by d12av01.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id
 n6SHuWpx015048
	for <dev@harmony.apache.org>; Tue, 28 Jul 2009 19:56:32 +0200
Message-Id: <200907281756.n6SHuWpx015048@d12av01.megacenter.de.ibm.com>
X-Mailer: exmh version 2.7.2 01/07/2005 (debian 1:2.7.2-16) with nmh-1.2
In-reply-to: <a43fbc6a0907280853p51dc62acieaafdc833b8be074@mail.gmail.com> 
References: <a43fbc6a0907280853p51dc62acieaafdc833b8be074@mail.gmail.com>
Comments: In-reply-to Jesse Wilson <jessewilson@google.com>
   message dated "Tue, 28 Jul 2009 08:53:26 -0700."
From: Mark Hindess <mark.hindess@googlemail.com>
To: dev@harmony.apache.org
Subject: Re: Avoid reformatting third-party code? 
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Tue, 28 Jul 2009 18:56:31 +0100
X-Virus-Checked: Checked by ClamAV on apache.org


In message <a43fbc6a0907280853p51dc62acieaafdc833b8be074@mail.gmail.com>,
Jesse Wilson writes:
>
> Harmony folks,
> I've started to watch the Harmony commit logs and I saw a commit that
> I disagree with!

Cool.  The more people that do this the better.  Please feel free to
just reply to the commit messsages with your comments (since they have
the dev@ list as the reply-to address).

> I figured that it was a good opportunity for a discussion...

Which commit?  (Are you mistakenly referring to the recent trunk ->
java6 branch merge commit?)

> The commit fixed some style problems in the java.util.concurrent
> package. It fixed whitespace problems and Javadoc inconsistencies,
> replacing <tt>Object</tt> with {@code Object}. In general, such
> changes are improvements, but we should make an exception for
> third-party code.

+1

If they are genuine improvements, I'm sure the upstream would be happy
to take them.

> The unnecessary deltas will make merging and integrating future
> changes from upstream much more labor intensive. And if it's more
> difficult to integrate patches, we won't do so very frequently!
>
> This advice is from experience. I work on Android's Dalvik
> classlibraries, which is itself downstream of Harmony. We've made
> a broad exception to our project's style guide so we can avoid
> reformatting code. This saves me a significant amount of merging
> effort.

Indeed.  Incidentally, I recently merged the trunk (java5) to the java6
branch.  In doing so, I merge your updated backported code to the java6
branch.  It is my intention to revert the backporting to get the java6
code to have minimal changes from the upstream source over the next
week or two.

Regards,
 Mark.