From Sergey.Bylokhov at oracle.com  Mon Aug  4 12:00:53 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Mon, 04 Aug 2014 16:00:53 +0400
Subject: <Swing Dev> [9] Review Request: 6521727 DefaultTreeCellEditor
 doesn't implement Serializable
Message-ID: <53DF75F5.3070602@oracle.com>

Hello.
Please review a small fix for jdk9.

Bug: https://bugs.openjdk.java.net/browse/JDK-6521727
Webrev can be found at: http://cr.openjdk.java.net/~serb/6521727/webrev.00

-- 
Best regards, Sergey.



From alexander.zvegintsev at oracle.com  Mon Aug  4 12:14:21 2014
From: alexander.zvegintsev at oracle.com (Alexander Zvegintsev)
Date: Mon, 04 Aug 2014 16:14:21 +0400
Subject: <Swing Dev> [9] Review Request: 6521727 DefaultTreeCellEditor
 doesn't implement Serializable
In-Reply-To: <53DF75F5.3070602@oracle.com>
References: <53DF75F5.3070602@oracle.com>
Message-ID: <53DF791D.3060507@oracle.com>

Hi Sergey,

the fix looks good to me.

Thanks,

Alexander.

On 08/04/2014 04:00 PM, Sergey Bylokhov wrote:
> Hello.
> Please review a small fix for jdk9.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-6521727
> Webrev can be found at: 
> http://cr.openjdk.java.net/~serb/6521727/webrev.00
>



From robbiexgibson at yahoo.com  Tue Aug  5 07:34:05 2014
From: robbiexgibson at yahoo.com (Robert Gibson)
Date: Tue, 5 Aug 2014 00:34:05 -0700
Subject: <Swing Dev> Fw: JDK 9 RFR of JDK-8043550 : Fix raw and unchecked
	lint warnings in javax.swing.*
In-Reply-To: <1406811286.56331.YahooMailNeo@web121301.mail.ne1.yahoo.com>
References: <1406811286.56331.YahooMailNeo@web121301.mail.ne1.yahoo.com>
Message-ID: <1407224045.98045.YahooMailNeo@web121306.mail.ne1.yahoo.com>

Hi Joe,
Sorry, I replied to this mailing list message but realised afterwards that you're not a list subscriber ...
Regards,
Robert


On Thursday, 31 July 2014, 14:54, Robert Gibson <robbiexgibson at yahoo.com> wrote:
On Mon Jun 30 16:20:50 UTC 2014, Joe Darcy <joe.darcy at oracle.com> wrote:


> It was not immediately clear how javax.swing.tree.TreeNode.children(),?
> which returns a raw Enumeration, should be generified. I changed it to
> Enumeration<TreeNode> children(); and that seems to work fine. Something like
> Enumeration<? extends TreeNode> with a covariant override would save a few casts in a private?
> implementation, but generally doesn't seem to be a good trade-off since?
> many normal clients could be inconvenienced dealing with the wildcard.?

Hi Joe,
We have a few implementations of TreeNode that look like this:

class MyTreeNode implements TreeNode {
? public Enumeration<MyTreeNode> children() { ... }
}

They don't compile any more after the change to TreeNode. Maybe something like this would have fewer compatibility issues?

public interface TreeNode<C extends TreeNode>
{
? ...
? Enumeration<C> children();
? ...
}

Regards,
Robert 


From alexandr.scherbatiy at oracle.com  Tue Aug  5 08:54:11 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Tue, 05 Aug 2014 12:54:11 +0400
Subject: <Swing Dev> [9] Review Request: 6521727 DefaultTreeCellEditor
 doesn't implement Serializable
In-Reply-To: <53DF75F5.3070602@oracle.com>
References: <53DF75F5.3070602@oracle.com>
Message-ID: <53E09BB3.2040808@oracle.com>


Should the @SuppressWarnings("serial") annotation be also removed?

Thanks,
Alexandr.

On 8/4/2014 4:00 PM, Sergey Bylokhov wrote:
> Hello.
> Please review a small fix for jdk9.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-6521727
> Webrev can be found at: 
> http://cr.openjdk.java.net/~serb/6521727/webrev.00
>



From Sergey.Bylokhov at oracle.com  Tue Aug  5 09:00:06 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Tue, 05 Aug 2014 13:00:06 +0400
Subject: <Swing Dev> [9] Review Request: 6521727 DefaultTreeCellEditor
 doesn't implement Serializable
In-Reply-To: <53E09BB3.2040808@oracle.com>
References: <53DF75F5.3070602@oracle.com> <53E09BB3.2040808@oracle.com>
Message-ID: <53E09D16.7050700@oracle.com>

Hi, Alexander.
No, it covers some warnings inside inner classes.

On 05.08.2014 12:54, Alexander Scherbatiy wrote:
>
> Should the @SuppressWarnings("serial") annotation be also removed?
>
> Thanks,
> Alexandr.
>
> On 8/4/2014 4:00 PM, Sergey Bylokhov wrote:
>> Hello.
>> Please review a small fix for jdk9.
>>
>> Bug: https://bugs.openjdk.java.net/browse/JDK-6521727
>> Webrev can be found at: 
>> http://cr.openjdk.java.net/~serb/6521727/webrev.00
>>
>


-- 
Best regards, Sergey.



From alexandr.scherbatiy at oracle.com  Tue Aug  5 09:06:11 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Tue, 05 Aug 2014 13:06:11 +0400
Subject: <Swing Dev> [9] Review Request: 6521727 DefaultTreeCellEditor
 doesn't implement Serializable
In-Reply-To: <53E09D16.7050700@oracle.com>
References: <53DF75F5.3070602@oracle.com> <53E09BB3.2040808@oracle.com>
	<53E09D16.7050700@oracle.com>
Message-ID: <53E09E83.5030301@oracle.com>

On 8/5/2014 1:00 PM, Sergey Bylokhov wrote:
> Hi, Alexander.
> No, it covers some warnings inside inner classes.

   Could the annotation be moved to the inner classes?

   Thanks,
   Alexandr.
>
> On 05.08.2014 12:54, Alexander Scherbatiy wrote:
>>
>> Should the @SuppressWarnings("serial") annotation be also removed?
>>
>> Thanks,
>> Alexandr.
>>
>> On 8/4/2014 4:00 PM, Sergey Bylokhov wrote:
>>> Hello.
>>> Please review a small fix for jdk9.
>>>
>>> Bug: https://bugs.openjdk.java.net/browse/JDK-6521727
>>> Webrev can be found at: 
>>> http://cr.openjdk.java.net/~serb/6521727/webrev.00
>>>
>>
>
>



From Sergey.Bylokhov at oracle.com  Tue Aug  5 09:24:52 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Tue, 05 Aug 2014 13:24:52 +0400
Subject: <Swing Dev> [9] Review Request: 6521727 DefaultTreeCellEditor
 doesn't implement Serializable
In-Reply-To: <53E09E83.5030301@oracle.com>
References: <53DF75F5.3070602@oracle.com> <53E09BB3.2040808@oracle.com>
	<53E09D16.7050700@oracle.com> <53E09E83.5030301@oracle.com>
Message-ID: <53E0A2E4.1060104@oracle.com>

On 05.08.2014 13:06, Alexander Scherbatiy wrote:
> On 8/5/2014 1:00 PM, Sergey Bylokhov wrote:
>> Hi, Alexander.
>> No, it covers some warnings inside inner classes.
>
>   Could the annotation be moved to the inner classes?
Yes, we can.
New version:
http://cr.openjdk.java.net/~serb/6521727/webrev.01
>
>   Thanks,
>   Alexandr.
>>
>> On 05.08.2014 12:54, Alexander Scherbatiy wrote:
>>>
>>> Should the @SuppressWarnings("serial") annotation be also removed?
>>>
>>> Thanks,
>>> Alexandr.
>>>
>>> On 8/4/2014 4:00 PM, Sergey Bylokhov wrote:
>>>> Hello.
>>>> Please review a small fix for jdk9.
>>>>
>>>> Bug: https://bugs.openjdk.java.net/browse/JDK-6521727
>>>> Webrev can be found at: 
>>>> http://cr.openjdk.java.net/~serb/6521727/webrev.00
>>>>
>>>
>>
>>
>


-- 
Best regards, Sergey.



From alexandr.scherbatiy at oracle.com  Tue Aug  5 09:40:43 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Tue, 05 Aug 2014 13:40:43 +0400
Subject: <Swing Dev> [9] Review Request: 6521727 DefaultTreeCellEditor
 doesn't implement Serializable
In-Reply-To: <53E0A2E4.1060104@oracle.com>
References: <53DF75F5.3070602@oracle.com> <53E09BB3.2040808@oracle.com>
	<53E09D16.7050700@oracle.com> <53E09E83.5030301@oracle.com>
	<53E0A2E4.1060104@oracle.com>
Message-ID: <53E0A69B.6070709@oracle.com>


   The fix looks good to me.

  Thanks,
  Alexandr.

On 8/5/2014 1:24 PM, Sergey Bylokhov wrote:
> On 05.08.2014 13:06, Alexander Scherbatiy wrote:
>> On 8/5/2014 1:00 PM, Sergey Bylokhov wrote:
>>> Hi, Alexander.
>>> No, it covers some warnings inside inner classes.
>>
>>   Could the annotation be moved to the inner classes?
> Yes, we can.
> New version:
> http://cr.openjdk.java.net/~serb/6521727/webrev.01
>>
>>   Thanks,
>>   Alexandr.
>>>
>>> On 05.08.2014 12:54, Alexander Scherbatiy wrote:
>>>>
>>>> Should the @SuppressWarnings("serial") annotation be also removed?
>>>>
>>>> Thanks,
>>>> Alexandr.
>>>>
>>>> On 8/4/2014 4:00 PM, Sergey Bylokhov wrote:
>>>>> Hello.
>>>>> Please review a small fix for jdk9.
>>>>>
>>>>> Bug: https://bugs.openjdk.java.net/browse/JDK-6521727
>>>>> Webrev can be found at: 
>>>>> http://cr.openjdk.java.net/~serb/6521727/webrev.00
>>>>>
>>>>
>>>
>>>
>>
>
>



From alexander.zvegintsev at oracle.com  Tue Aug  5 10:00:44 2014
From: alexander.zvegintsev at oracle.com (Alexander Zvegintsev)
Date: Tue, 05 Aug 2014 14:00:44 +0400
Subject: <Swing Dev> [9] Review Request: 6521727 DefaultTreeCellEditor
 doesn't implement Serializable
In-Reply-To: <53E0A69B.6070709@oracle.com>
References: <53DF75F5.3070602@oracle.com>
	<53E09BB3.2040808@oracle.com>	<53E09D16.7050700@oracle.com>
	<53E09E83.5030301@oracle.com>	<53E0A2E4.1060104@oracle.com>
	<53E0A69B.6070709@oracle.com>
Message-ID: <53E0AB4C.8010806@oracle.com>

The fix still looks good for me.

Thanks,

Alexander.

On 08/05/2014 01:40 PM, Alexander Scherbatiy wrote:
>
>   The fix looks good to me.
>
>  Thanks,
>  Alexandr.
>
> On 8/5/2014 1:24 PM, Sergey Bylokhov wrote:
>> On 05.08.2014 13:06, Alexander Scherbatiy wrote:
>>> On 8/5/2014 1:00 PM, Sergey Bylokhov wrote:
>>>> Hi, Alexander.
>>>> No, it covers some warnings inside inner classes.
>>>
>>>   Could the annotation be moved to the inner classes?
>> Yes, we can.
>> New version:
>> http://cr.openjdk.java.net/~serb/6521727/webrev.01
>>>
>>>   Thanks,
>>>   Alexandr.
>>>>
>>>> On 05.08.2014 12:54, Alexander Scherbatiy wrote:
>>>>>
>>>>> Should the @SuppressWarnings("serial") annotation be also removed?
>>>>>
>>>>> Thanks,
>>>>> Alexandr.
>>>>>
>>>>> On 8/4/2014 4:00 PM, Sergey Bylokhov wrote:
>>>>>> Hello.
>>>>>> Please review a small fix for jdk9.
>>>>>>
>>>>>> Bug: https://bugs.openjdk.java.net/browse/JDK-6521727
>>>>>> Webrev can be found at: 
>>>>>> http://cr.openjdk.java.net/~serb/6521727/webrev.00
>>>>>>
>>>>>
>>>>
>>>>
>>>
>>
>>
>



From Sergey.Bylokhov at oracle.com  Tue Aug  5 13:57:12 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Tue, 05 Aug 2014 17:57:12 +0400
Subject: <Swing Dev> [9] Review Request: 6521706 A switch operator in
 JFrame.processWindowEvent() should be rewritten
Message-ID: <53E0E2B8.7010403@oracle.com>

Hello.
Please review a small fix for a warning from the another tool, which is 
simpler to fix than to close.
Commented method was removed, since it was commented from the beginning, 
when it was added in 1997.

Bug: https://bugs.openjdk.java.net/browse/JDK-6521706
Webrev can be found at: http://cr.openjdk.java.net/~serb/6521706/webrev.00

-- 
Best regards, Sergey.



From alexander.zvegintsev at oracle.com  Tue Aug  5 14:10:14 2014
From: alexander.zvegintsev at oracle.com (Alexander Zvegintsev)
Date: Tue, 05 Aug 2014 18:10:14 +0400
Subject: <Swing Dev> [9] Review Request: 6521706 A switch operator in
 JFrame.processWindowEvent() should be rewritten
In-Reply-To: <53E0E2B8.7010403@oracle.com>
References: <53E0E2B8.7010403@oracle.com>
Message-ID: <53E0E5C6.3070206@oracle.com>

Hi Sergey,

the fix looks fine for me.

Thanks,

Alexander.

On 08/05/2014 05:57 PM, Sergey Bylokhov wrote:
> Hello.
> Please review a small fix for a warning from the another tool, which 
> is simpler to fix than to close.
> Commented method was removed, since it was commented from the 
> beginning, when it was added in 1997.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-6521706
> Webrev can be found at: 
> http://cr.openjdk.java.net/~serb/6521706/webrev.00
>



From alexandr.scherbatiy at oracle.com  Wed Aug  6 07:50:05 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Wed, 06 Aug 2014 11:50:05 +0400
Subject: <Swing Dev> [9] Review Request: 6521706 A switch operator in
 JFrame.processWindowEvent() should be rewritten
In-Reply-To: <53E0E2B8.7010403@oracle.com>
References: <53E0E2B8.7010403@oracle.com>
Message-ID: <53E1DE2D.5030401@oracle.com>


   The fix looks good to me.

   Thanks,
   Alexandr.

On 8/5/2014 5:57 PM, Sergey Bylokhov wrote:
> Hello.
> Please review a small fix for a warning from the another tool, which 
> is simpler to fix than to close.
> Commented method was removed, since it was commented from the 
> beginning, when it was added in 1997.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-6521706
> Webrev can be found at: 
> http://cr.openjdk.java.net/~serb/6521706/webrev.00
>



From artem.malinko at oracle.com  Wed Aug  6 12:04:35 2014
From: artem.malinko at oracle.com (artem malinko)
Date: Wed, 06 Aug 2014 16:04:35 +0400
Subject: <Swing Dev> Review request for 8042835: unexpected mnemonic in
	JFileChooser
Message-ID: <53E219D3.3070402@oracle.com>

Hello, Swing team.

Please review a fix for the issue:
https://bugs.openjdk.java.net/browse/JDK-8042835
The fix is available at:
http://cr.openjdk.java.net/~dmarkov/8042835/webrev.00/ 
<http://cr.openjdk.java.net/%7Emcherkas/artem/8047288/webrev.01/>

Bug relates to:
https://bugs.openjdk.java.net/browse/JDK-5081721
https://bugs.openjdk.java.net/browse/JDK-7174970
Back then not all properties were fixed. This fix simply finishes 
started work.

Thank you.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140806/fb6a8aa3/attachment.html>

From Sergey.Bylokhov at oracle.com  Thu Aug  7 10:47:57 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Thu, 07 Aug 2014 14:47:57 +0400
Subject: <Swing Dev> [9] Review request for 8049533
 SwingUtilities.convertMouseEvent misses
 MouseWheelEvent.preciseWheelRotation
In-Reply-To: <53BEAA06.1060306@oracle.com>
References: <53BE691F.9070406@oracle.com> <53BE6C44.5000101@oracle.com>
	<53BEA40C.1080009@oracle.com>
	<8AF7562C-81F4-4A5C-B838-74D7EB957AEA@oracle.com>
	<53BEAA06.1060306@oracle.com>
Message-ID: <53E3595D.1060600@oracle.com>

Hi, Alexander.
The fix looks good.

On 10.07.2014 18:58, Alexander Scherbatiy wrote:
>
> Could you review the updated version:
>    http://cr.openjdk.java.net/~alexsch/8049533/webrev.02/
>
>   The xAbs and yAbs fields are also copied in the 
> LWComponentPeer.createDelegateEvent() and ResizeBox.mouseWheelMoved() 
> methods.
>
>   Thanks,
>   Alexandr.
>
> On 7/10/2014 6:45 PM, Petr Pchelko wrote:
>> Hello, Alexander.
>>
>> The .01 version looks good.
>>
>> With best regards. Petr.
>>
>> On 10 ???? 2014 ?., at 18:32, Alexander Scherbatiy 
>> <alexandr.scherbatiy at oracle.com> wrote:
>>
>>> Could you review the updated fix:
>>>     http://cr.openjdk.java.net/~alexsch/8049533/webrev.01
>>>
>>> The preciseWheelRotation field is copied in the 
>>> LWComponentPeer.createDelegateEvent() and 
>>> ResizeBox.mouseWheelMoved() methods.
>>>
>>> Thanks,
>>> Alexandr.
>>>
>>> On 7/10/2014 2:34 PM, Sergey Bylokhov wrote:
>>>> Hi, Alexander.
>>>> Same fix should be applied to 
>>>> LWComponentPeer.createDelegateEvent(), and probably to 
>>>> ResizeBox.mouseWheelMoved. Please check all place where 
>>>> getWheelRotation is used.
>>>>
>>>> On 10.07.2014 14:21, Alexander Scherbatiy wrote:
>>>>> Hello,
>>>>>
>>>>> Could you review the fix:
>>>>>   bug: https://bugs.openjdk.java.net/browse/JDK-8049533
>>>>>   webrev: http://cr.openjdk.java.net/~alexsch/8049533/webrev.00
>>>>>
>>>>>
>>>>>   The preciseWheelRotation field copying is missed in the 
>>>>> SwingUtilities.convertMouseEvent(...) method.
>>>>>
>>>>> Thanks,
>>>>> Alexandr.
>>>>>
>>>>
>


-- 
Best regards, Sergey.



From Sergey.Bylokhov at oracle.com  Thu Aug  7 10:52:21 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Thu, 07 Aug 2014 14:52:21 +0400
Subject: <Swing Dev> [9] Review request for 8017284 Aqua LaF: memory
 leak when HTML is used for JTabbedPane tab titles
In-Reply-To: <53CFB000.2060103@oracle.com>
References: <53CE75F4.7040306@oracle.com> <53CE9563.7000902@oracle.com>
	<53CFB000.2060103@oracle.com>
Message-ID: <53E35A65.8030508@oracle.com>

Hi, Alexander.
The fix looks good.

On 23.07.2014 16:52, Alexander Scherbatiy wrote:
> On 7/22/2014 8:46 PM, Sergey Bylokhov wrote:
>> Hi, Alexander.
>> Should we update  BasicTabbedPaneUI also?
>
>    The BasicTabbedPaneUIdoes not have the memory leak because it 
> removes html view element before inserting new one.
>    However, it is faster to set new element rather then removing and 
> inserting it.
>    I have also missed the case that a tab can be inserting between 
> others. I fix it also.
>
>   Could you review the updated fix:
>     http://cr.openjdk.java.net/~alexsch/8017284/webrev.01/
>
>   Thanks,
>   Alexandr.
>
>>
>> On 7/22/14 6:32 PM, Alexander Scherbatiy wrote:
>>>
>>> Hello,
>>>
>>> Could you review the fix:
>>>   bug: https://bugs.openjdk.java.net/browse/JDK-8017284
>>>   webrev: http://cr.openjdk.java.net/~alexsch/8017284/webrev.00
>>>
>>>   The memory leak in Aqua TabbedPaneUI is fixed.
>>>
>>> Thanks,
>>> Alexandr.
>>>
>>
>>
>


-- 
Best regards, Sergey.



From alexandr.scherbatiy at oracle.com  Thu Aug  7 14:04:18 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Thu, 07 Aug 2014 18:04:18 +0400
Subject: <Swing Dev> Review request for 8042835: unexpected mnemonic in
 JFileChooser
In-Reply-To: <53E219D3.3070402@oracle.com>
References: <53E219D3.3070402@oracle.com>
Message-ID: <53E38762.5080409@oracle.com>


  The fix looks good to me.

  The link to the webrev points to the 8047288 fix instead of 8042835.

  Thanks,
  Alexandr.

On 8/6/2014 4:04 PM, artem malinko wrote:
> Hello, Swing team.
>
> Please review a fix for the issue:
> https://bugs.openjdk.java.net/browse/JDK-8042835
> The fix is available at:
> http://cr.openjdk.java.net/~dmarkov/8042835/webrev.00/ 
> <http://cr.openjdk.java.net/%7Emcherkas/artem/8047288/webrev.01/>
>
> Bug relates to:
> https://bugs.openjdk.java.net/browse/JDK-5081721
> https://bugs.openjdk.java.net/browse/JDK-7174970
> Back then not all properties were fixed. This fix simply finishes 
> started work.
>
> Thank you. 



From artem.malinko at oracle.com  Thu Aug  7 14:21:07 2014
From: artem.malinko at oracle.com (artem malinko)
Date: Thu, 07 Aug 2014 18:21:07 +0400
Subject: <Swing Dev> Review request for 8042835: unexpected mnemonic in
 JFileChooser
In-Reply-To: <53E38762.5080409@oracle.com>
References: <53E219D3.3070402@oracle.com> <53E38762.5080409@oracle.com>
Message-ID: <53E38B53.4030401@oracle.com>

Thank you, Alexandr.

 > The link to the webrev points to the 8047288 fix instead of 8042835
Sorry, some weird copy and paste.

Here is the good link for the next reviewer:
http://cr.openjdk.java.net/~dmarkov/8042835/webrev.00/

On 8/7/2014 6:04 PM, Alexander Scherbatiy wrote:
>
>  The fix looks good to me.
>
>  The link to the webrev points to the 8047288 fix instead of 8042835.
>
>  Thanks,
>  Alexandr.
>
> On 8/6/2014 4:04 PM, artem malinko wrote:
>> Hello, Swing team.
>>
>> Please review a fix for the issue:
>> https://bugs.openjdk.java.net/browse/JDK-8042835
>> The fix is available at:
>> http://cr.openjdk.java.net/~dmarkov/8042835/webrev.00/ 
>> <http://cr.openjdk.java.net/%7Emcherkas/artem/8047288/webrev.01/>
>>
>> Bug relates to:
>> https://bugs.openjdk.java.net/browse/JDK-5081721
>> https://bugs.openjdk.java.net/browse/JDK-7174970
>> Back then not all properties were fixed. This fix simply finishes 
>> started work.
>>
>> Thank you. 
>



From joe.darcy at oracle.com  Fri Aug  8 02:20:55 2014
From: joe.darcy at oracle.com (Joe Darcy)
Date: Thu, 07 Aug 2014 19:20:55 -0700
Subject: <Swing Dev> JDK 9 RFR of JDK-8054360: Refine generification of
	javax.swing
Message-ID: <53E43407.8090104@oracle.com>

Hello,

Please review my changes for

     JDK-8054360: Refine generification of javax.swing h
http://cr.openjdk.java.net/~darcy/8054360.3/

Full patch below.

This resolves many of the source incompatibility exemplars Jan Lahoda 
found in a corpus of programs using swing.

A few comments on the changes.

It seems many existing implementations of the TreeNode interface have a 
covariant override of the old raw

     Enumeration children();

method which returns an enumeration of the specific TreeNode 
implementation type. The revised generification of

     Enumeration<? extends TreeNode> children();

allows those existing implementations to still compile. This is a 
lower-impact way of allowing those types to still compile compared to 
trying to add a type variable to TreeNode.

After some expert generics advice from Dan Smith, I but together a 
different generification of

     src/share/classes/javax/swing/table/DefaultTableModel.java

which has better source compatibility. Quoting from the changes:

   73     @SuppressWarnings("rawtypes")
   74     protected Vector<Vector>    dataVector;
   75
   76     /** The <code>Vector</code> of column identifiers. */
   77     @SuppressWarnings("rawtypes")
   78     protected Vector    columnIdentifiers;
   79     // Unfortunately, for greater source compatibility the inner-most
   80     // Vector in the two fields above is being left raw. The Vector is
   81     // read as well as written so using Vector<?> is not suitable and
   82     // using Vector<Object> (without adding copying of input Vectors),
   83     // would disallow existing code that used, say, a Vector<String>
   84     // as an input parameter.

The setter methods used for these fields are changes to have parameters 
of type Vector<?> and Vector<? extends Vector>, respectively.

The type Vector<? extends Vector> is the most general type which 
captures the implicit constraint of the dataVector field: it is a Vector 
of other Vectors. (It would probably be possible to update dataVector to 
the somewhat more general Vector<List>, but that would require changes 
to the code in other methods of the class.)

The changes in 
src/share/classes/sun/tools/jconsole/inspector/TableSorter.java change 
the code back to how it was before the swing generification changes went 
in based on the changes to DefaultTableModel.

Once the exact generification is settled, I'll file the internal ccc 
paperwork.

Early feedback on using this revised generification on swing code is 
welcome!

Thanks,

-Joe

--- old/src/share/classes/javax/swing/JSlider.java    2014-08-07 
16:53:58.000000000 -0700
+++ new/src/share/classes/javax/swing/JSlider.java    2014-08-07 
16:53:58.000000000 -0700
@@ -138,7 +138,7 @@
      /**
       * {@code Dictionary} of what labels to draw at which values
       */
-    private Dictionary<Integer, JComponent> labelTable;
+    private Dictionary<Integer, ? extends JComponent> labelTable;


      /**
@@ -773,7 +773,7 @@
          }

          // Check that there is a label with such image
-        Enumeration<JComponent> elements = labelTable.elements();
+        Enumeration<? extends JComponent> elements = labelTable.elements();

          while (elements.hasMoreElements()) {
              JComponent component = elements.nextElement();
@@ -797,7 +797,7 @@
       * @return the <code>Dictionary</code> containing labels and
       *    where to draw them
       */
-    public Dictionary<Integer, JComponent> getLabelTable() {
+    public Dictionary<Integer, ? extends JComponent> getLabelTable() {
  /*
          if ( labelTable == null && getMajorTickSpacing() > 0 ) {
              setLabelTable( createStandardLabels( getMajorTickSpacing() 
) );
@@ -830,8 +830,8 @@
       *    attribute: visualUpdate true
       *  description: Specifies what labels will be drawn for any given 
value.
       */
-    public void setLabelTable( Dictionary<Integer, JComponent> labels ) {
-        Dictionary<Integer, JComponent> oldTable = labelTable;
+    public void setLabelTable( Dictionary<Integer, ? extends 
JComponent> labels ) {
+        Dictionary<Integer, ? extends JComponent> oldTable = labelTable;
          labelTable = labels;
          updateLabelUIs();
          firePropertyChange("labelTable", oldTable, labelTable );
@@ -852,7 +852,7 @@
       * @see JComponent#updateUI
       */
      protected void updateLabelUIs() {
-        Dictionary<Integer, JComponent> labelTable = getLabelTable();
+        Dictionary<Integer, ? extends JComponent> labelTable = 
getLabelTable();

          if (labelTable == null) {
              return;
@@ -866,9 +866,9 @@
      }

      private void updateLabelSizes() {
-        Dictionary<Integer, JComponent> labelTable = getLabelTable();
+        Dictionary<Integer, ? extends JComponent> labelTable = 
getLabelTable();
          if (labelTable != null) {
-            Enumeration<JComponent> labels = labelTable.elements();
+            Enumeration<? extends JComponent> labels = 
labelTable.elements();
              while (labels.hasMoreElements()) {
                  JComponent component = labels.nextElement();
                  component.setSize(component.getPreferredSize());
@@ -1017,7 +1017,7 @@

          SmartHashtable table = new SmartHashtable( increment, start );

-        Dictionary<Integer, JComponent> labelTable = getLabelTable();
+        Dictionary<Integer, ? extends JComponent> labelTable = 
getLabelTable();

          if (labelTable != null && (labelTable instanceof 
PropertyChangeListener)) {
              removePropertyChangeListener((PropertyChangeListener) 
labelTable);
--- old/src/share/classes/javax/swing/JTable.java    2014-08-07 
16:53:59.000000000 -0700
+++ new/src/share/classes/javax/swing/JTable.java    2014-08-07 
16:53:59.000000000 -0700
@@ -669,7 +669,8 @@
       * @param rowData           the data for the new table
       * @param columnNames       names of each column
       */
-    public JTable(Vector<Vector<Object>> rowData, Vector<Object> 
columnNames) {
+    @SuppressWarnings("rawtypes")
+    public JTable(Vector<? extends Vector> rowData, Vector<?> 
columnNames) {
          this(new DefaultTableModel(rowData, columnNames));
      }

--- old/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java 
2014-08-07 16:54:00.000000000 -0700
+++ new/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java 
2014-08-07 16:54:00.000000000 -0700
@@ -397,10 +397,10 @@
      protected boolean labelsHaveSameBaselines() {
          if (!checkedLabelBaselines) {
              checkedLabelBaselines = true;
-            Dictionary<?, JComponent> dictionary = slider.getLabelTable();
+            Dictionary<Integer, ? extends JComponent> dictionary = 
slider.getLabelTable();
              if (dictionary != null) {
                  sameLabelBaselines = true;
-                Enumeration<JComponent> elements = dictionary.elements();
+                Enumeration<? extends JComponent> elements = 
dictionary.elements();
                  int baseline = -1;
                  while (elements.hasMoreElements()) {
                      JComponent label = elements.nextElement();
@@ -753,7 +753,7 @@
      }

      protected int getWidthOfWidestLabel() {
-        Dictionary<?, JComponent> dictionary = slider.getLabelTable();
+        Dictionary<?, ? extends JComponent> dictionary = 
slider.getLabelTable();
          int widest = 0;
          if ( dictionary != null ) {
              Enumeration<?> keys = dictionary.keys();
@@ -766,7 +766,7 @@
      }

      protected int getHeightOfTallestLabel() {
-        Dictionary<?, JComponent> dictionary = slider.getLabelTable();
+        Dictionary<?, ? extends JComponent> dictionary = 
slider.getLabelTable();
          int tallest = 0;
          if ( dictionary != null ) {
              Enumeration<?> keys = dictionary.keys();
@@ -871,7 +871,7 @@
       * @since 1.6
       */
      protected Integer getLowestValue() {
-        Dictionary<Integer, JComponent> dictionary = 
slider.getLabelTable();
+        Dictionary<Integer, ? extends JComponent> dictionary = 
slider.getLabelTable();

          if (dictionary == null) {
              return null;
@@ -1121,7 +1121,7 @@
      public void paintLabels( Graphics g ) {
          Rectangle labelBounds = labelRect;

-        Dictionary<Integer, JComponent> dictionary = 
slider.getLabelTable();
+        Dictionary<Integer, ? extends JComponent> dictionary = 
slider.getLabelTable();
          if ( dictionary != null ) {
              Enumeration<Integer> keys = dictionary.keys();
              int minValue = slider.getMinimum();
--- old/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java 
2014-08-07 16:54:02.000000000 -0700
+++ new/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java 
2014-08-07 16:54:01.000000000 -0700
@@ -392,7 +392,7 @@
                  trackRect.x = insetCache.left;
                  trackRect.width = contentRect.width;

-                Dictionary<Integer, JComponent> dictionary = 
slider.getLabelTable();
+                Dictionary<Integer, ? extends JComponent> dictionary = 
slider.getLabelTable();
                  if (dictionary != null) {
                      int minValue = slider.getMinimum();
                      int maxValue = slider.getMaximum();
--- old/src/share/classes/javax/swing/table/DefaultTableModel.java 
2014-08-07 16:54:03.000000000 -0700
+++ new/src/share/classes/javax/swing/table/DefaultTableModel.java 
2014-08-07 16:54:02.000000000 -0700
@@ -70,10 +70,18 @@
       * The <code>Vector</code> of <code>Vectors</code> of
       * <code>Object</code> values.
       */
-    protected Vector<Vector<Object>>    dataVector;
+    @SuppressWarnings("rawtypes")
+    protected Vector<Vector>    dataVector;

      /** The <code>Vector</code> of column identifiers. */
-    protected Vector<Object>    columnIdentifiers;
+    @SuppressWarnings("rawtypes")
+    protected Vector    columnIdentifiers;
+    // Unfortunately, for greater source compatibility the inner-most
+    // Vector in the two fields above is being left raw. The Vector is
+    // read as well as written so using Vector<?> is not suitable and
+    // using Vector<Object> (without adding copying of input Vectors),
+    // would disallow existing code that used, say, a Vector<String>
+    // as an input parameter.

  //
  // Constructors
@@ -121,7 +129,7 @@
       * @see #setDataVector
       * @see #setValueAt
       */
-    public DefaultTableModel(Vector<Object> columnNames, int rowCount) {
+    public DefaultTableModel(Vector<?> columnNames, int rowCount) {
          setDataVector(newVector(rowCount), columnNames);
      }

@@ -156,7 +164,8 @@
       * @see #getDataVector
       * @see #setDataVector
       */
-    public DefaultTableModel(Vector<Vector<Object>> data, 
Vector<Object> columnNames) {
+    @SuppressWarnings("rawtypes")
+    public DefaultTableModel(Vector<? extends Vector> data, Vector<?> 
columnNames) {
          setDataVector(data, columnNames);
      }

@@ -191,7 +200,8 @@
       * @see #newRowsAdded
       * @see #setDataVector
       */
-    public Vector<Vector<Object>> getDataVector() {
+    @SuppressWarnings("rawtypes")
+    public Vector<Vector> getDataVector() {
          return dataVector;
      }

@@ -219,9 +229,10 @@
       * @param   columnIdentifiers     the names of the columns
       * @see #getDataVector
       */
-    public void setDataVector(Vector<Vector<Object>> dataVector,
-                              Vector<Object> columnIdentifiers) {
-        this.dataVector = nonNullVector(dataVector);
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public void setDataVector(Vector<? extends Vector> dataVector,
+                              Vector<?> columnIdentifiers) {
+        this.dataVector = nonNullVector((Vector<Vector>)dataVector);
          this.columnIdentifiers = nonNullVector(columnIdentifiers);
          justifyRows(0, getRowCount());
          fireTableStructureChanged();
@@ -267,7 +278,7 @@
              if (dataVector.elementAt(i) == null) {
                  dataVector.setElementAt(new Vector<>(), i);
              }
- ((Vector)dataVector.elementAt(i)).setSize(getColumnCount());
+            dataVector.elementAt(i).setSize(getColumnCount());
          }
      }

@@ -350,7 +361,7 @@
       *
       * @param   rowData          optional data of the row being added
       */
-    public void addRow(Vector<Object> rowData) {
+    public void addRow(Vector<?> rowData) {
          insertRow(getRowCount(), rowData);
      }

@@ -374,7 +385,7 @@
       * @param   rowData         optional data of the row being added
       * @exception  ArrayIndexOutOfBoundsException  if the row was invalid
       */
-    public void insertRow(int row, Vector<Object> rowData) {
+    public void insertRow(int row, Vector<?> rowData) {
          dataVector.insertElementAt(rowData, row);
          justifyRows(row, row+1);
          fireTableRowsInserted(row, row);
@@ -484,7 +495,7 @@
       *                          to zero columns
       * @see #setNumRows
       */
-    public void setColumnIdentifiers(Vector<Object> columnIdentifiers) {
+    public void setColumnIdentifiers(Vector<?> columnIdentifiers) {
          setDataVector(dataVector, columnIdentifiers);
      }

@@ -550,7 +561,8 @@
       * @param   columnName the identifier of the column being added
       * @param   columnData       optional data of the column being added
       */
-    public void addColumn(Object columnName, Vector<Object> columnData) {
+    @SuppressWarnings("unchecked") // Adding element to raw 
columnIdentifiers
+    public void addColumn(Object columnName, Vector<?> columnData) {
          columnIdentifiers.addElement(columnName);
          if (columnData != null) {
              int columnSize = columnData.size();
@@ -652,6 +664,7 @@
       *               column was given
       */
      public Object getValueAt(int row, int column) {
+        @SuppressWarnings("unchecked")
          Vector<Object> rowVector = dataVector.elementAt(row);
          return rowVector.elementAt(column);
      }
@@ -668,6 +681,7 @@
       *               column was given
       */
      public void setValueAt(Object aValue, int row, int column) {
+        @SuppressWarnings("unchecked")
          Vector<Object> rowVector = dataVector.elementAt(row);
          rowVector.setElementAt(aValue, column);
          fireTableCellUpdated(row, column);
--- old/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java 
2014-08-07 16:54:04.000000000 -0700
+++ new/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java 
2014-08-07 16:54:04.000000000 -0700
@@ -1308,7 +1308,7 @@
      }

      private final class PreorderEnumeration implements 
Enumeration<TreeNode> {
-        private final Stack<Enumeration<TreeNode>> stack = new Stack<>();
+        private final Stack<Enumeration<? extends TreeNode>> stack = 
new Stack<>();

          public PreorderEnumeration(TreeNode rootNode) {
              super();
@@ -1322,10 +1322,9 @@
          }

          public TreeNode nextElement() {
-            Enumeration<TreeNode> enumer = stack.peek();
+            Enumeration<? extends TreeNode> enumer = stack.peek();
              TreeNode    node = enumer.nextElement();
-            @SuppressWarnings("unchecked")
-            Enumeration<TreeNode> children = node.children();
+            Enumeration<? extends TreeNode> children = node.children();

              if (!enumer.hasMoreElements()) {
                  stack.pop();
@@ -1342,7 +1341,7 @@

      final class PostorderEnumeration implements Enumeration<TreeNode> {
          protected TreeNode root;
-        protected Enumeration<TreeNode> children;
+        protected Enumeration<? extends TreeNode> children;
          protected Enumeration<TreeNode> subtree;

          public PostorderEnumeration(TreeNode rootNode) {
--- old/src/share/classes/javax/swing/tree/TreeNode.java 2014-08-07 
16:54:05.000000000 -0700
+++ new/src/share/classes/javax/swing/tree/TreeNode.java 2014-08-07 
16:54:05.000000000 -0700
@@ -99,5 +99,5 @@
       *
       * @return              the children of the receiver as an {@code 
Enumeration}
       */
-    Enumeration<TreeNode> children();
+    Enumeration<? extends TreeNode> children();
  }
--- old/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java 
2014-08-07 16:54:06.000000000 -0700
+++ new/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java 
2014-08-07 16:54:06.000000000 -0700
@@ -146,7 +146,7 @@
          // update row heights in XMBeanAttributes (required by 
expandable cells)
          if (attrs != null) {
              for (int i = 0; i < getRowCount(); i++) {
-                Vector<?> data = (Vector) dataVector.elementAt(i);
+                Vector<?> data = dataVector.elementAt(i);
                  attrs.updateRowHeight(data.elementAt(1), i);
              }
          }
@@ -217,17 +217,17 @@
              }
      }

-    private Vector<Object> getRow(int row) {
+    private Vector<?> getRow(int row) {
          return dataVector.elementAt(row);
      }

      @SuppressWarnings("unchecked")
-    private void setRow(Vector<Object> data, int row) {
+    private void setRow(Vector<?> data, int row) {
          dataVector.setElementAt(data,row);
      }

      private void swap(int i, int j, int column) {
-        Vector<Object> data = getRow(i);
+        Vector<?> data = getRow(i);
          setRow(getRow(j),i);
          setRow(data,j);




From robbiexgibson at yahoo.com  Fri Aug  8 10:02:26 2014
From: robbiexgibson at yahoo.com (Robert Gibson)
Date: Fri, 8 Aug 2014 12:02:26 +0200
Subject: <Swing Dev> JDK 9 RFR of JDK-8054360: Refine generification of
	javax.swing
In-Reply-To: <53E43407.8090104@oracle.com>
References: <53E43407.8090104@oracle.com>
Message-ID: <7019E400-08C8-4CFF-85C8-4E805947F17E@yahoo.com>

On 8 Aug 2014, at 04:20, Joe Darcy <joe.darcy at oracle.com> wrote:

> Hello,
> 
> Please review my changes for
> 
>    JDK-8054360: Refine generification of javax.swing h
> http://cr.openjdk.java.net/~darcy/8054360.3/
> 
> Full patch below.
> 
> This resolves many of the source incompatibility exemplars Jan Lahoda found in a corpus of programs using swing.
> 
> A few comments on the changes.
> 
> It seems many existing implementations of the TreeNode interface have a covariant override of the old raw
> 
>    Enumeration children();
> 
> method which returns an enumeration of the specific TreeNode implementation type. The revised generification of
> 
>    Enumeration<? extends TreeNode> children();
> 
> allows those existing implementations to still compile. This is a lower-impact way of allowing those types to still compile compared to trying to add a type variable to TreeNode.
> 
> After some expert generics advice from Dan Smith, I but together a different generification of
> 
>    src/share/classes/javax/swing/table/DefaultTableModel.java
> 
> which has better source compatibility. Quoting from the changes:
> 
>  73     @SuppressWarnings("rawtypes")
>  74     protected Vector<Vector>    dataVector;
>  75
>  76     /** The <code>Vector</code> of column identifiers. */
>  77     @SuppressWarnings("rawtypes")
>  78     protected Vector    columnIdentifiers;
>  79     // Unfortunately, for greater source compatibility the inner-most
>  80     // Vector in the two fields above is being left raw. The Vector is
>  81     // read as well as written so using Vector<?> is not suitable and
>  82     // using Vector<Object> (without adding copying of input Vectors),
>  83     // would disallow existing code that used, say, a Vector<String>
>  84     // as an input parameter.
> 
> The setter methods used for these fields are changes to have parameters of type Vector<?> and Vector<? extends Vector>, respectively.
> 
> The type Vector<? extends Vector> is the most general type which captures the implicit constraint of the dataVector field: it is a Vector of other Vectors. (It would probably be possible to update dataVector to the somewhat more general Vector<List>, but that would require changes to the code in other methods of the class.)
> 
> The changes in src/share/classes/sun/tools/jconsole/inspector/TableSorter.java change the code back to how it was before the swing generification changes went in based on the changes to DefaultTableModel.
> 
> Once the exact generification is settled, I'll file the internal ccc paperwork.
> 
> Early feedback on using this revised generification on swing code is welcome!
> 
> Thanks,
> 
> -Joe
> 
> --- old/src/share/classes/javax/swing/JSlider.java    2014-08-07 16:53:58.000000000 -0700
> +++ new/src/share/classes/javax/swing/JSlider.java    2014-08-07 16:53:58.000000000 -0700
> @@ -138,7 +138,7 @@
>     /**
>      * {@code Dictionary} of what labels to draw at which values
>      */
> -    private Dictionary<Integer, JComponent> labelTable;
> +    private Dictionary<Integer, ? extends JComponent> labelTable;
> 
> 
>     /**
> @@ -773,7 +773,7 @@
>         }
> 
>         // Check that there is a label with such image
> -        Enumeration<JComponent> elements = labelTable.elements();
> +        Enumeration<? extends JComponent> elements = labelTable.elements();
> 
>         while (elements.hasMoreElements()) {
>             JComponent component = elements.nextElement();
> @@ -797,7 +797,7 @@
>      * @return the <code>Dictionary</code> containing labels and
>      *    where to draw them
>      */
> -    public Dictionary<Integer, JComponent> getLabelTable() {
> +    public Dictionary<Integer, ? extends JComponent> getLabelTable() {
> /*
>         if ( labelTable == null && getMajorTickSpacing() > 0 ) {
>             setLabelTable( createStandardLabels( getMajorTickSpacing() ) );
> @@ -830,8 +830,8 @@
>      *    attribute: visualUpdate true
>      *  description: Specifies what labels will be drawn for any given value.
>      */
> -    public void setLabelTable( Dictionary<Integer, JComponent> labels ) {
> -        Dictionary<Integer, JComponent> oldTable = labelTable;
> +    public void setLabelTable( Dictionary<Integer, ? extends JComponent> labels ) {
> +        Dictionary<Integer, ? extends JComponent> oldTable = labelTable;
>         labelTable = labels;
>         updateLabelUIs();
>         firePropertyChange("labelTable", oldTable, labelTable );
> @@ -852,7 +852,7 @@
>      * @see JComponent#updateUI
>      */
>     protected void updateLabelUIs() {
> -        Dictionary<Integer, JComponent> labelTable = getLabelTable();
> +        Dictionary<Integer, ? extends JComponent> labelTable = getLabelTable();
> 
>         if (labelTable == null) {
>             return;
> @@ -866,9 +866,9 @@
>     }
> 
>     private void updateLabelSizes() {
> -        Dictionary<Integer, JComponent> labelTable = getLabelTable();
> +        Dictionary<Integer, ? extends JComponent> labelTable = getLabelTable();
>         if (labelTable != null) {
> -            Enumeration<JComponent> labels = labelTable.elements();
> +            Enumeration<? extends JComponent> labels = labelTable.elements();
>             while (labels.hasMoreElements()) {
>                 JComponent component = labels.nextElement();
>                 component.setSize(component.getPreferredSize());
> @@ -1017,7 +1017,7 @@
> 
>         SmartHashtable table = new SmartHashtable( increment, start );
> 
> -        Dictionary<Integer, JComponent> labelTable = getLabelTable();
> +        Dictionary<Integer, ? extends JComponent> labelTable = getLabelTable();
> 
>         if (labelTable != null && (labelTable instanceof PropertyChangeListener)) {
>             removePropertyChangeListener((PropertyChangeListener) labelTable);
> --- old/src/share/classes/javax/swing/JTable.java    2014-08-07 16:53:59.000000000 -0700
> +++ new/src/share/classes/javax/swing/JTable.java    2014-08-07 16:53:59.000000000 -0700
> @@ -669,7 +669,8 @@
>      * @param rowData           the data for the new table
>      * @param columnNames       names of each column
>      */
> -    public JTable(Vector<Vector<Object>> rowData, Vector<Object> columnNames) {
> +    @SuppressWarnings("rawtypes")
> +    public JTable(Vector<? extends Vector> rowData, Vector<?> columnNames) {
>         this(new DefaultTableModel(rowData, columnNames));
>     }
> 
> --- old/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java 2014-08-07 16:54:00.000000000 -0700
> +++ new/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java 2014-08-07 16:54:00.000000000 -0700
> @@ -397,10 +397,10 @@
>     protected boolean labelsHaveSameBaselines() {
>         if (!checkedLabelBaselines) {
>             checkedLabelBaselines = true;
> -            Dictionary<?, JComponent> dictionary = slider.getLabelTable();
> +            Dictionary<Integer, ? extends JComponent> dictionary = slider.getLabelTable();
>             if (dictionary != null) {
>                 sameLabelBaselines = true;
> -                Enumeration<JComponent> elements = dictionary.elements();
> +                Enumeration<? extends JComponent> elements = dictionary.elements();
>                 int baseline = -1;
>                 while (elements.hasMoreElements()) {
>                     JComponent label = elements.nextElement();
> @@ -753,7 +753,7 @@
>     }
> 
>     protected int getWidthOfWidestLabel() {
> -        Dictionary<?, JComponent> dictionary = slider.getLabelTable();
> +        Dictionary<?, ? extends JComponent> dictionary = slider.getLabelTable();
>         int widest = 0;
>         if ( dictionary != null ) {
>             Enumeration<?> keys = dictionary.keys();
> @@ -766,7 +766,7 @@
>     }
> 
>     protected int getHeightOfTallestLabel() {
> -        Dictionary<?, JComponent> dictionary = slider.getLabelTable();
> +        Dictionary<?, ? extends JComponent> dictionary = slider.getLabelTable();
>         int tallest = 0;
>         if ( dictionary != null ) {
>             Enumeration<?> keys = dictionary.keys();
> @@ -871,7 +871,7 @@
>      * @since 1.6
>      */
>     protected Integer getLowestValue() {
> -        Dictionary<Integer, JComponent> dictionary = slider.getLabelTable();
> +        Dictionary<Integer, ? extends JComponent> dictionary = slider.getLabelTable();
> 
>         if (dictionary == null) {
>             return null;
> @@ -1121,7 +1121,7 @@
>     public void paintLabels( Graphics g ) {
>         Rectangle labelBounds = labelRect;
> 
> -        Dictionary<Integer, JComponent> dictionary = slider.getLabelTable();
> +        Dictionary<Integer, ? extends JComponent> dictionary = slider.getLabelTable();
>         if ( dictionary != null ) {
>             Enumeration<Integer> keys = dictionary.keys();
>             int minValue = slider.getMinimum();
> --- old/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java 2014-08-07 16:54:02.000000000 -0700
> +++ new/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java 2014-08-07 16:54:01.000000000 -0700
> @@ -392,7 +392,7 @@
>                 trackRect.x = insetCache.left;
>                 trackRect.width = contentRect.width;
> 
> -                Dictionary<Integer, JComponent> dictionary = slider.getLabelTable();
> +                Dictionary<Integer, ? extends JComponent> dictionary = slider.getLabelTable();
>                 if (dictionary != null) {
>                     int minValue = slider.getMinimum();
>                     int maxValue = slider.getMaximum();
> --- old/src/share/classes/javax/swing/table/DefaultTableModel.java 2014-08-07 16:54:03.000000000 -0700
> +++ new/src/share/classes/javax/swing/table/DefaultTableModel.java 2014-08-07 16:54:02.000000000 -0700
> @@ -70,10 +70,18 @@
>      * The <code>Vector</code> of <code>Vectors</code> of
>      * <code>Object</code> values.
>      */
> -    protected Vector<Vector<Object>>    dataVector;
> +    @SuppressWarnings("rawtypes")
> +    protected Vector<Vector>    dataVector;
> 
>     /** The <code>Vector</code> of column identifiers. */
> -    protected Vector<Object>    columnIdentifiers;
> +    @SuppressWarnings("rawtypes")
> +    protected Vector    columnIdentifiers;
> +    // Unfortunately, for greater source compatibility the inner-most
> +    // Vector in the two fields above is being left raw. The Vector is
> +    // read as well as written so using Vector<?> is not suitable and
> +    // using Vector<Object> (without adding copying of input Vectors),
> +    // would disallow existing code that used, say, a Vector<String>
> +    // as an input parameter.
> 
> //
> // Constructors
> @@ -121,7 +129,7 @@
>      * @see #setDataVector
>      * @see #setValueAt
>      */
> -    public DefaultTableModel(Vector<Object> columnNames, int rowCount) {
> +    public DefaultTableModel(Vector<?> columnNames, int rowCount) {
>         setDataVector(newVector(rowCount), columnNames);
>     }
> 
> @@ -156,7 +164,8 @@
>      * @see #getDataVector
>      * @see #setDataVector
>      */
> -    public DefaultTableModel(Vector<Vector<Object>> data, Vector<Object> columnNames) {
> +    @SuppressWarnings("rawtypes")
> +    public DefaultTableModel(Vector<? extends Vector> data, Vector<?> columnNames) {
>         setDataVector(data, columnNames);
>     }
> 
> @@ -191,7 +200,8 @@
>      * @see #newRowsAdded
>      * @see #setDataVector
>      */
> -    public Vector<Vector<Object>> getDataVector() {
> +    @SuppressWarnings("rawtypes")
> +    public Vector<Vector> getDataVector() {
>         return dataVector;
>     }
> 
> @@ -219,9 +229,10 @@
>      * @param   columnIdentifiers     the names of the columns
>      * @see #getDataVector
>      */
> -    public void setDataVector(Vector<Vector<Object>> dataVector,
> -                              Vector<Object> columnIdentifiers) {
> -        this.dataVector = nonNullVector(dataVector);
> +    @SuppressWarnings({"rawtypes", "unchecked"})
> +    public void setDataVector(Vector<? extends Vector> dataVector,
> +                              Vector<?> columnIdentifiers) {
> +        this.dataVector = nonNullVector((Vector<Vector>)dataVector);
>         this.columnIdentifiers = nonNullVector(columnIdentifiers);
>         justifyRows(0, getRowCount());
>         fireTableStructureChanged();
> @@ -267,7 +278,7 @@
>             if (dataVector.elementAt(i) == null) {
>                 dataVector.setElementAt(new Vector<>(), i);
>             }
> - ((Vector)dataVector.elementAt(i)).setSize(getColumnCount());
> +            dataVector.elementAt(i).setSize(getColumnCount());
>         }
>     }
> 
> @@ -350,7 +361,7 @@
>      *
>      * @param   rowData          optional data of the row being added
>      */
> -    public void addRow(Vector<Object> rowData) {
> +    public void addRow(Vector<?> rowData) {
>         insertRow(getRowCount(), rowData);
>     }
> 
> @@ -374,7 +385,7 @@
>      * @param   rowData         optional data of the row being added
>      * @exception  ArrayIndexOutOfBoundsException  if the row was invalid
>      */
> -    public void insertRow(int row, Vector<Object> rowData) {
> +    public void insertRow(int row, Vector<?> rowData) {
>         dataVector.insertElementAt(rowData, row);
>         justifyRows(row, row+1);
>         fireTableRowsInserted(row, row);
> @@ -484,7 +495,7 @@
>      *                          to zero columns
>      * @see #setNumRows
>      */
> -    public void setColumnIdentifiers(Vector<Object> columnIdentifiers) {
> +    public void setColumnIdentifiers(Vector<?> columnIdentifiers) {
>         setDataVector(dataVector, columnIdentifiers);
>     }
> 
> @@ -550,7 +561,8 @@
>      * @param   columnName the identifier of the column being added
>      * @param   columnData       optional data of the column being added
>      */
> -    public void addColumn(Object columnName, Vector<Object> columnData) {
> +    @SuppressWarnings("unchecked") // Adding element to raw columnIdentifiers
> +    public void addColumn(Object columnName, Vector<?> columnData) {
>         columnIdentifiers.addElement(columnName);
>         if (columnData != null) {
>             int columnSize = columnData.size();
> @@ -652,6 +664,7 @@
>      *               column was given
>      */
>     public Object getValueAt(int row, int column) {
> +        @SuppressWarnings("unchecked")
>         Vector<Object> rowVector = dataVector.elementAt(row);
>         return rowVector.elementAt(column);
>     }
> @@ -668,6 +681,7 @@
>      *               column was given
>      */
>     public void setValueAt(Object aValue, int row, int column) {
> +        @SuppressWarnings("unchecked")
>         Vector<Object> rowVector = dataVector.elementAt(row);
>         rowVector.setElementAt(aValue, column);
>         fireTableCellUpdated(row, column);
> --- old/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java 2014-08-07 16:54:04.000000000 -0700
> +++ new/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java 2014-08-07 16:54:04.000000000 -0700
> @@ -1308,7 +1308,7 @@
>     }
> 
>     private final class PreorderEnumeration implements Enumeration<TreeNode> {
> -        private final Stack<Enumeration<TreeNode>> stack = new Stack<>();
> +        private final Stack<Enumeration<? extends TreeNode>> stack = new Stack<>();
> 
>         public PreorderEnumeration(TreeNode rootNode) {
>             super();
> @@ -1322,10 +1322,9 @@
>         }
> 
>         public TreeNode nextElement() {
> -            Enumeration<TreeNode> enumer = stack.peek();
> +            Enumeration<? extends TreeNode> enumer = stack.peek();
>             TreeNode    node = enumer.nextElement();
> -            @SuppressWarnings("unchecked")
> -            Enumeration<TreeNode> children = node.children();
> +            Enumeration<? extends TreeNode> children = node.children();
> 
>             if (!enumer.hasMoreElements()) {
>                 stack.pop();
> @@ -1342,7 +1341,7 @@
> 
>     final class PostorderEnumeration implements Enumeration<TreeNode> {
>         protected TreeNode root;
> -        protected Enumeration<TreeNode> children;
> +        protected Enumeration<? extends TreeNode> children;
>         protected Enumeration<TreeNode> subtree;
> 
>         public PostorderEnumeration(TreeNode rootNode) {
> --- old/src/share/classes/javax/swing/tree/TreeNode.java 2014-08-07 16:54:05.000000000 -0700
> +++ new/src/share/classes/javax/swing/tree/TreeNode.java 2014-08-07 16:54:05.000000000 -0700
> @@ -99,5 +99,5 @@
>      *
>      * @return              the children of the receiver as an {@code Enumeration}
>      */
> -    Enumeration<TreeNode> children();
> +    Enumeration<? extends TreeNode> children();
> }
> --- old/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java 2014-08-07 16:54:06.000000000 -0700
> +++ new/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java 2014-08-07 16:54:06.000000000 -0700
> @@ -146,7 +146,7 @@
>         // update row heights in XMBeanAttributes (required by expandable cells)
>         if (attrs != null) {
>             for (int i = 0; i < getRowCount(); i++) {
> -                Vector<?> data = (Vector) dataVector.elementAt(i);
> +                Vector<?> data = dataVector.elementAt(i);
>                 attrs.updateRowHeight(data.elementAt(1), i);
>             }
>         }
> @@ -217,17 +217,17 @@
>             }
>     }
> 
> -    private Vector<Object> getRow(int row) {
> +    private Vector<?> getRow(int row) {
>         return dataVector.elementAt(row);
>     }
> 
>     @SuppressWarnings("unchecked")
> -    private void setRow(Vector<Object> data, int row) {
> +    private void setRow(Vector<?> data, int row) {
>         dataVector.setElementAt(data,row);
>     }
> 
>     private void swap(int i, int j, int column) {
> -        Vector<Object> data = getRow(i);
> +        Vector<?> data = getRow(i);
>         setRow(getRow(j),i);
>         setRow(data,j);
> 
> 

Hi Joe,
These changes look better for us.  Note that we still have one incompatibility in a TreeNode stub implementation:

public Enumeration<?> getChildren()
{
    throw new RuntimeException(?Not implemented?);
}

but this one is a hopeless case anyway as a pretty bad stab at approximating a bottom type, so we will end up changing it.

Regards,
Robert

From Sergey.Bylokhov at oracle.com  Fri Aug  8 12:15:32 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Fri, 08 Aug 2014 16:15:32 +0400
Subject: <Swing Dev> [9] Review Request: 6302052 Reference to nonexistant
	Class in javadoc
Message-ID: <53E4BF64.9040803@oracle.com>

Hello.
Please review the small fix for jdk 9. Typo was fixed as suggested in 
the CR.

Bug: https://bugs.openjdk.java.net/browse/JDK-6302052
Webrev can be found at: http://cr.openjdk.java.net/~serb/6302052/webrev.00

-- 
Best regards, Sergey.



From alexander.zvegintsev at oracle.com  Fri Aug  8 12:28:33 2014
From: alexander.zvegintsev at oracle.com (Alexander Zvegintsev)
Date: Fri, 08 Aug 2014 16:28:33 +0400
Subject: <Swing Dev> [9] Review Request: 6302052 Reference to
 nonexistant Class in javadoc
In-Reply-To: <53E4BF64.9040803@oracle.com>
References: <53E4BF64.9040803@oracle.com>
Message-ID: <53E4C271.5000605@oracle.com>

Hi Sergey,

the fix looks fine.

Thanks,

Alexander.

On 08/08/2014 04:15 PM, Sergey Bylokhov wrote:
> Hello.
> Please review the small fix for jdk 9. Typo was fixed as suggested in 
> the CR.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-6302052
> Webrev can be found at: 
> http://cr.openjdk.java.net/~serb/6302052/webrev.00
>



From alexandr.scherbatiy at oracle.com  Fri Aug  8 12:57:23 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Fri, 08 Aug 2014 16:57:23 +0400
Subject: <Swing Dev> [9] Review Request: 6302052 Reference to
 nonexistant Class in javadoc
In-Reply-To: <53E4C271.5000605@oracle.com>
References: <53E4BF64.9040803@oracle.com> <53E4C271.5000605@oracle.com>
Message-ID: <53E4C933.5030402@oracle.com>


   The fix looks good to me.

   Thanks,
   Alexandr.

On 8/8/2014 4:28 PM, Alexander Zvegintsev wrote:
> Hi Sergey,
>
> the fix looks fine.
>
> Thanks,
>
> Alexander.
>
> On 08/08/2014 04:15 PM, Sergey Bylokhov wrote:
>> Hello.
>> Please review the small fix for jdk 9. Typo was fixed as suggested in 
>> the CR.
>>
>> Bug: https://bugs.openjdk.java.net/browse/JDK-6302052
>> Webrev can be found at: 
>> http://cr.openjdk.java.net/~serb/6302052/webrev.00
>>
>



From otaviojava at java.net  Sun Aug 10 21:33:30 2014
From: otaviojava at java.net (=?UTF-8?Q?Ot=C3=A1vio_Gon=C3=A7alves_de_Santana?=)
Date: Sun, 10 Aug 2014 18:33:30 -0300
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
Message-ID: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>

*Motivation:* Make another append instead of concat String inside of append
parameter in StringBuilder class. To avoid an extra StringBuilder created
for the purpose of concatenating. So it will save memory and will faster
than concat String.
Doing a code to benchMark[1], the result is:

Benchmark                                                  Mode   Samples
      Mean   Mean error    Units
m.StringBuilderConcatBenchMark.stringBuilder              thrpt        10
 6317444.705   108673.584    ops/s
m.StringBuilderConcatBenchMark.stringBuilderWithConcat    thrpt        10
 3354554.435    68353.924    ops/s

The webrev of all code is:
https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat.zip
<https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat.zip>

[1]

@State(Scope.Thread)
@OutputTimeUnit(TimeUnit.SECONDS)
public class StringBuilderConcatBenchMark {


        private static final String F = "!!!!";
 private static final String E = " running in Java ";
private static final String D = " in the code ";
 private static final String C = " to try impact ";
private static final String B = " with some text ";
 private static final String A = "Doing a test";

@GenerateMicroBenchmark
public void stringBuilder(BlackHole bh) {
 bh.consume(createBuilder(A, B, C, D, E, F));
}

@GenerateMicroBenchmark
 public void stringBuilderWithConcat(BlackHole bh) {
bh.consume(createBuilderWithConcat(A, B, C, D, E, F));
 }

private StringBuilder createBuilder(String... values) {
StringBuilder text = new StringBuilder();
 text.append(values[0]).append(values[1])
.append(values[2]).append(values[3])
.append(values[4]).append(values[5]);
 return text;
}
 private StringBuilder createBuilderWithConcat(String... values) {
 StringBuilder text = new StringBuilder();
text.append(values[0] + values[1])
.append(values[2] + values[3])
 .append(values[4]+ values[5]);
return text;
}
}

-- 
Ot?vio Gon?alves de Santana

blog:     http://otaviosantana.blogspot.com.br/
twitter: http://twitter.com/otaviojava
site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
55 (11) 98255-3513
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140810/3a766b6d/attachment.html>
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/ThreadTab.java
--- a/src/share/classes/sun/tools/jconsole/ThreadTab.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/ThreadTab.java	Sun Aug 10 18:02:01 2014 -0300
@@ -368,7 +368,7 @@
                             sb.append(Messages.STACK_TRACE);
                             int index = 0;
                             for (StackTraceElement e : ti.getStackTrace()) {
-                                sb.append(e.toString()+"\n");
+                                sb.append(e.toString()).append("\n");
                                 if (monitors != null) {
                                     for (MonitorInfo mi : monitors) {
                                         if (mi.getLockedStackDepth() == index) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Sun Aug 10 18:02:01 2014 -0300
@@ -79,25 +79,24 @@
             String textColor = String.format("%06x",
                                              foreground.getRGB() & 0xFFFFFF);
             StringBuilder sb = new StringBuilder();
-            sb.append("<html><body text=#"+textColor+"><table width=\"100%\">");
+            sb.append("<html><body text=#").append(textColor).append("><table width=\"100%\">");
             for (int i = 0; i < arr.length; i++) {
                 if (i % 2 == 0) {
-                    sb.append("<tr style=\"background-color: " +
-                            evenRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(evenRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 } else {
-                    sb.append("<tr style=\"background-color: " +
-                            oddRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(oddRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 }
             }
             if (arr.length == 0) {
-                sb.append("<tr style=\"background-color: " +
-                        evenRowColorStr + "\"><td></td></tr>");
+                sb.append("<tr style=\"background-color: ").append(evenRowColorStr).append("\"><td></td></tr>");
             }
             sb.append("</table></body></html>");
             arrayEditor.setText(sb.toString());
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XTree.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Sun Aug 10 18:02:01 2014 -0300
@@ -507,13 +507,13 @@
         // key order defined by the "orderedKeyPropertyList"
         for (String key : orderedKeyPropertyList) {
             if (map.containsKey(key)) {
-                sb.append(key + "=" + map.get(key) + ",");
+                sb.append(key).append("=").append(map.get(key)).append(",");
                 map.remove(key);
             }
         }
         // Add the remaining key/value pairs to the buffer
         for (Map.Entry<String, String> entry : map.entrySet()) {
-            sb.append(entry.getKey() + "=" + entry.getValue() + ",");
+            sb.append(entry.getKey()).append("=").append(entry.getValue()).append(",");
         }
         String orderedKeyPropertyListString = sb.toString();
         orderedKeyPropertyListString = orderedKeyPropertyListString.substring(
@@ -622,7 +622,7 @@
                     //
                     StringBuilder sb = new StringBuilder();
                     for (MBeanParameterInfo mbpi : mboi.getSignature()) {
-                        sb.append(mbpi.getType() + ",");
+                        sb.append(mbpi.getType()).append(",");
                     }
                     String signature = sb.toString();
                     if (signature.length() > 0) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jps/Jps.java
--- a/src/share/classes/sun/tools/jps/Jps.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jps/Jps.java	Sun Aug 10 18:02:01 2014 -0300
@@ -92,28 +92,28 @@
                     vm = monitoredHost.getMonitoredVm(id, 0);
 
                     errorString = " -- main class information unavailable";
-                    output.append(" " + MonitoredVmUtil.mainClass(vm,
+                    output.append(" ").append(MonitoredVmUtil.mainClass(vm,
                             arguments.showLongPaths()));
 
                     if (arguments.showMainArgs()) {
                         errorString = " -- main args information unavailable";
                         String mainArgs = MonitoredVmUtil.mainArgs(vm);
                         if (mainArgs != null && mainArgs.length() > 0) {
-                            output.append(" " + mainArgs);
+                            output.append(" ").append(mainArgs);
                         }
                     }
                     if (arguments.showVmArgs()) {
                         errorString = " -- jvm args information unavailable";
                         String jvmArgs = MonitoredVmUtil.jvmArgs(vm);
                         if (jvmArgs != null && jvmArgs.length() > 0) {
-                          output.append(" " + jvmArgs);
+                          output.append(" ").append(jvmArgs);
                         }
                     }
                     if (arguments.showVmFlags()) {
                         errorString = " -- jvm flags information unavailable";
                         String jvmFlags = MonitoredVmUtil.jvmFlags(vm);
                         if (jvmFlags != null && jvmFlags.length() > 0) {
-                            output.append(" " + jvmFlags);
+                            output.append(" ").append(jvmFlags);
                         }
                     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/RawOutputFormatter.java
--- a/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Sun Aug 10 18:02:01 2014 -0300
@@ -50,7 +50,7 @@
             StringBuilder headerBuilder = new StringBuilder();
             for (Iterator<Monitor> i = logged.iterator(); i.hasNext(); /* empty */ ) {
                 Monitor m = i.next();
-                headerBuilder.append(m.getName() + " ");
+                headerBuilder.append(m.getName()).append(" ");
             }
             header = headerBuilder.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/SyntaxException.java
--- a/src/share/classes/sun/tools/jstat/SyntaxException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/SyntaxException.java	Sun Aug 10 18:02:01 2014 -0300
@@ -65,7 +65,7 @@
     public SyntaxException(int lineno, Set<String> expected, Token found) {
         StringBuilder msg = new StringBuilder();
 
-        msg.append("Syntax error at line " + lineno + ": Expected one of \'");
+        msg.append("Syntax error at line ").append(lineno).append(": Expected one of \'");
 
         boolean first = true;
         for (Iterator<String> i = expected.iterator(); i.hasNext(); /* empty */) {
@@ -74,11 +74,11 @@
                 msg.append(keyWord);
                 first = false;
             } else {
-                msg.append("|" + keyWord);
+                msg.append("|").append(keyWord);
             }
         }
 
-        msg.append("\', Found " + found.toMessage());
+        msg.append("\', Found ").append(found.toMessage());
         message = msg.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/Token.java
--- a/src/share/classes/sun/tools/jstat/Token.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/Token.java	Sun Aug 10 18:02:01 2014 -0300
@@ -89,18 +89,18 @@
             sb.append("ttype=TT_EOF");
             break;
         case StreamTokenizer.TT_NUMBER:
-            sb.append("ttype=TT_NUM,").append("nval="+nval);
+            sb.append("ttype=TT_NUM,").append("nval=").append(nval);
             break;
         case StreamTokenizer.TT_WORD:
             if (sval == null) {
                 sb.append("ttype=TT_WORD:IDENTIFIER");
             } else {
-                sb.append("ttype=TT_WORD:").append("sval="+sval);
+                sb.append("ttype=TT_WORD:").append("sval=").append(sval);
             }
             break;
         default:
             if (ttype == (int)'"') {
-                sb.append("ttype=TT_STRING:").append("sval="+sval);
+                sb.append("ttype=TT_STRING:").append("sval=").append(sval);
             } else {
                 sb.append("ttype=TT_CHAR:").append((char)ttype);
             }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstatd/RemoteHostImpl.java
--- a/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Sun Aug 10 18:02:01 2014 -0300
@@ -68,7 +68,7 @@
 
         sb.append("local://").append(lvmid).append("@localhost");
         if (mode != null) {
-            sb.append("?mode=" + mode);
+            sb.append("?mode=").append(mode);
         }
 
         String vmidStr = sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/security/acl/AclEntryImpl.java
--- a/src/share/classes/sun/security/acl/AclEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/acl/AclEntryImpl.java	Sun Aug 10 18:02:01 2014 -0300
@@ -147,7 +147,7 @@
             s.append("Group.");
         else
             s.append("User.");
-        s.append(user + "=");
+        s.append(user).append("=");
         Enumeration<Permission> e = permissions();
         while(e.hasMoreElements()) {
             Permission p = e.nextElement();
diff -r dde9f5cfde5f src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
--- a/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Sun Aug 10 18:02:01 2014 -0300
@@ -640,8 +640,7 @@
 
         for (int i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append("0").append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
--- a/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Sun Aug 10 18:02:01 2014 -0300
@@ -158,8 +158,8 @@
         }
         sb.append(hexDumper.encode(certHash));
         if (issuer != null && serialNumber != null) {
-            sb.append("\n\tIssuer: " + issuer + "\n");
-            sb.append("\t" + serialNumber);
+            sb.append("\n\tIssuer: ").append(issuer).append("\n");
+            sb.append("\t").append(serialNumber);
         }
         sb.append("\n]");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs11/P11KeyStore.java
--- a/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Sun Aug 10 18:02:01 2014 -0300
@@ -196,24 +196,24 @@
             } else if (type == ATTR_CLASS_CERT) {
                 sb.append("\ttype=[trusted cert]\n");
             }
-            sb.append("\tlabel=[" + label + "]\n");
+            sb.append("\tlabel=[").append(label).append("]\n");
             if (id == null) {
                 sb.append("\tid=[null]\n");
             } else {
-                sb.append("\tid=" + P11KeyStore.getID(id) + "\n");
+                sb.append("\tid=").append(P11KeyStore.getID(id)).append("\n");
             }
-            sb.append("\ttrusted=[" + trusted + "]\n");
-            sb.append("\tmatched=[" + matched + "]\n");
+            sb.append("\ttrusted=[").append(trusted).append("]\n");
+            sb.append("\tmatched=[").append(matched).append("]\n");
             if (cert == null) {
                 sb.append("\tcert=[null]\n");
             } else {
-                sb.append("\tcert=[\tsubject: " +
-                        cert.getSubjectX500Principal() +
-                        "\n\t\tissuer: " +
-                        cert.getIssuerX500Principal() +
-                        "\n\t\tserialNum: " +
-                        cert.getSerialNumber().toString() +
-                        "]");
+                sb.append("\tcert=[\tsubject: ")
+                        .append(cert.getSubjectX500Principal())
+                        .append("\n\t\tissuer: ")
+                        .append(cert.getIssuerX500Principal())
+                        .append("\n\t\tserialNum: ")
+                        .append(cert.getSerialNumber().toString())
+                        .append("]");
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/PolicyFile.java
--- a/src/share/classes/sun/security/provider/PolicyFile.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/PolicyFile.java	Sun Aug 10 18:02:01 2014 -0300
@@ -1500,8 +1500,7 @@
                     if (i != 0) {
                         sb.append(", ");
                     }
-                    sb.append(principalInfo[i][0] + " " +
-                        "\"" + principalInfo[i][1] + "\"");
+                    sb.append(principalInfo[i][0]).append(" ").append("\"").append(principalInfo[i][1]).append("\"");
                 }
                 if (pli.hasNext()) {
                     sb.append(", ");
@@ -1776,9 +1775,9 @@
         if (principals != null && principals.length > 0) {
             StringBuilder palBuf = new StringBuilder("(principals ");
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                              " \"" + principals[i].getName() +
-                              "\"");
+                palBuf.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append("\"");
                 if (i < principals.length-1)
                     palBuf.append(", ");
                 else
@@ -1884,7 +1883,7 @@
                     throw new Exception(form.format(source));
                 }
 
-                sb.append(X500PRINCIPAL + " \"" + suffix + "\"");
+                sb.append(X500PRINCIPAL + " \"").append(suffix).append("\"");
                 startIndex = e+2;
             } else {
                 MessageFormat form = new MessageFormat
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/CertId.java
--- a/src/share/classes/sun/security/provider/certpath/CertId.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/CertId.java	Sun Aug 10 18:02:01 2014 -0300
@@ -223,13 +223,13 @@
     @Override public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CertId \n");
-        sb.append("Algorithm: " + hashAlgId.toString() +"\n");
+        sb.append("Algorithm: ").append(hashAlgId.toString()).append("\n");
         sb.append("issuerNameHash \n");
         HexDumpEncoder encoder = new HexDumpEncoder();
         sb.append(encoder.encode(issuerNameHash));
         sb.append("\nissuerKeyHash: \n");
         sb.append(encoder.encode(issuerKeyHash));
-        sb.append("\n" +  certSerialNumber.toString());
+        sb.append("\n").append(certSerialNumber.toString());
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/OCSPResponse.java
--- a/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Sun Aug 10 18:02:01 2014 -0300
@@ -812,14 +812,14 @@
             StringBuilder sb = new StringBuilder();
             sb.append("SingleResponse:  \n");
             sb.append(certId);
-            sb.append("\nCertStatus: "+ certStatus + "\n");
+            sb.append("\nCertStatus: ").append(certStatus).append("\n");
             if (certStatus == CertStatus.REVOKED) {
-                sb.append("revocationTime is " + revocationTime + "\n");
-                sb.append("revocationReason is " + revocationReason + "\n");
+                sb.append("revocationTime is ").append(revocationTime).append("\n");
+                sb.append("revocationReason is ").append(revocationReason).append("\n");
             }
-            sb.append("thisUpdate is " + thisUpdate + "\n");
+            sb.append("thisUpdate is ").append(thisUpdate).append("\n");
             if (nextUpdate != null) {
-                sb.append("nextUpdate is " + nextUpdate + "\n");
+                sb.append("nextUpdate is ").append(nextUpdate).append("\n");
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
--- a/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Sun Aug 10 18:02:01 2014 -0300
@@ -124,7 +124,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Build Forward Flag: " + String.valueOf(buildForward) + "\n");
+        sb.append("  Build Forward Flag: ").append(String.valueOf(buildForward)).append("\n");
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/HandshakeMessage.java
--- a/src/share/classes/sun/security/ssl/HandshakeMessage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/HandshakeMessage.java	Sun Aug 10 18:02:01 2014 -0300
@@ -1478,7 +1478,7 @@
                 boolean opened = false;
                 for (SignatureAndHashAlgorithm signAlg : algorithms) {
                     if (opened) {
-                        sb.append(", " + signAlg.getAlgorithmName());
+                        sb.append(", ").append(signAlg.getAlgorithmName());
                     } else {
                         sb.append(signAlg.getAlgorithmName());
                         opened = true;
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/ServerNameExtension.java
--- a/src/share/classes/sun/security/ssl/ServerNameExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/ServerNameExtension.java	Sun Aug 10 18:02:01 2014 -0300
@@ -268,7 +268,7 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         for (SNIServerName sniName : sniMap.values()) {
-            sb.append("[" + sniName + "]");
+            sb.append("[").append(sniName).append("]");
         }
 
         return "Extension " + type + ", server_name: " + sb;
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
--- a/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Sun Aug 10 18:02:01 2014 -0300
@@ -122,7 +122,7 @@
         boolean opened = false;
         for (SignatureAndHashAlgorithm signAlg : algorithms) {
             if (opened) {
-                sb.append(", " + signAlg.getAlgorithmName());
+                sb.append(", ").append(signAlg.getAlgorithmName());
             } else {
                 sb.append(signAlg.getAlgorithmName());
                 opened = true;
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
--- a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Sun Aug 10 18:02:01 2014 -0300
@@ -113,7 +113,7 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("Extension " + type + ", curve names: {");
+        sb.append("Extension ").append(type).append(", curve names: {");
         boolean first = true;
         for (int curveId : curveIds) {
             if (first) {
@@ -138,7 +138,7 @@
             } else if (curveId == ARBITRARY_CHAR2) {
                 sb.append("arbitrary_explicit_char2_curves");
             } else {
-                sb.append("unknown curve " + curveId);
+                sb.append("unknown curve ").append(curveId);
             }
         }
         sb.append("}");
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/jarsigner/Main.java
--- a/src/share/classes/sun/security/tools/jarsigner/Main.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/jarsigner/Main.java	Sun Aug 10 18:02:01 2014 -0300
@@ -676,13 +676,12 @@
                             ((man.getAttributes(name) != null) ||
                              (man.getAttributes("./"+name) != null) ||
                              (man.getAttributes("/"+name) != null));
-                        sb.append(
-                          (isSigned ? rb.getString("s") : rb.getString("SPACE")) +
-                          (inManifest ? rb.getString("m") : rb.getString("SPACE")) +
-                          (inStore ? rb.getString("k") : rb.getString("SPACE")) +
-                          (inScope ? rb.getString("i") : rb.getString("SPACE")) +
-                          ((inStoreOrScope & NOT_ALIAS) != 0 ?"X":" ") +
-                          rb.getString("SPACE"));
+                        sb.append(isSigned ? rb.getString("s") : rb.getString("SPACE"))
+                                .append(inManifest ? rb.getString("m") : rb.getString("SPACE"))
+                                .append(inStore ? rb.getString("k") : rb.getString("SPACE"))
+                                .append(inScope ? rb.getString("i") : rb.getString("SPACE"))
+                                .append((inStoreOrScope & NOT_ALIAS) != 0 ? "X" : " ")
+                                .append(rb.getString("SPACE"));
                         sb.append("|");
                     }
 
@@ -704,11 +703,11 @@
                         // Print no info for unsigned entries when -verbose:all,
                         // to be consistent with old behavior.
                         if (signatureRelated(name)) {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Signature.related.entries.") + "\n\n");
+                            sb.append("\n").append(tab).append(rb.getString(
+                                    ".Signature.related.entries.")).append("\n\n");
                         } else {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Unsigned.entries.") + "\n\n");
+                            sb.append("\n").append(tab).append(rb.getString(
+                                    ".Unsigned.entries.")).append("\n\n");
                         }
                     }
 
@@ -1605,8 +1604,8 @@
                 // No more warning, we alreay have hasExpiredCert or notYetValidCert
             } else {
                 chainNotValidated = true;
-                sb.append(tab + rb.getString(".CertPath.not.validated.") +
-                        e.getLocalizedMessage() + "]\n");   // TODO
+                sb.append(tab).append(rb.getString(".CertPath.not.validated."))
+                        .append(e.getLocalizedMessage()).append("]\n");   // TODO
             }
         }
         String result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/policytool/PolicyTool.java
--- a/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Sun Aug 10 18:02:01 2014 -0300
@@ -980,8 +980,9 @@
                                 grantEntry.principals.listIterator();
             while (list.hasNext()) {
                 PolicyParser.PrincipalEntry pppe = list.next();
-                sb.append(" Principal " + pppe.getDisplayClass() + " " +
-                    pppe.getDisplayName(true));
+                sb.append(" Principal ").append(pppe.getDisplayClass())
+                        .append(" ")
+                        .append(pppe.getDisplayName(true));
                 if (list.hasNext()) sb.append(", ");
             }
             result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/AVA.java
--- a/src/share/classes/sun/security/x509/AVA.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/AVA.java	Sun Aug 10 18:02:01 2014 -0300
@@ -1147,7 +1147,7 @@
                 // Emit the string ... quote it if needed
                 // if string is already quoted, don't re-quote
                 if (!alreadyQuoted && quoteNeeded) {
-                    retval.append("\"" + sbuffer.toString() + "\"");
+                    retval.append("\"").append(sbuffer.toString()).append("\"");
                 } else {
                     retval.append(sbuffer.toString());
                 }
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPoint.java
--- a/src/share/classes/sun/security/x509/DistributionPoint.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPoint.java	Sun Aug 10 18:02:01 2014 -0300
@@ -381,22 +381,22 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPoint:\n     " + fullName + "\n");
+            sb.append("DistributionPoint:\n     ").append(fullName).append("\n");
         }
         if (relativeName != null) {
-            sb.append("DistributionPoint:\n     " + relativeName + "\n");
+            sb.append("DistributionPoint:\n     ").append(relativeName).append("\n");
         }
 
         if (reasonFlags != null) {
             sb.append("   ReasonFlags:\n");
             for (int i = 0; i < reasonFlags.length; i++) {
                 if (reasonFlags[i]) {
-                    sb.append("    " + reasonToString(i) + "\n");
+                    sb.append("    ").append(reasonToString(i)).append("\n");
                 }
             }
         }
         if (crlIssuer != null) {
-            sb.append("   CRLIssuer:" + crlIssuer + "\n");
+            sb.append("   CRLIssuer:").append(crlIssuer).append("\n");
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPointName.java
--- a/src/share/classes/sun/security/x509/DistributionPointName.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPointName.java	Sun Aug 10 18:02:01 2014 -0300
@@ -231,10 +231,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPointName:\n     " + fullName + "\n");
+            sb.append("DistributionPointName:\n     ").append(fullName).append("\n");
 
         } else {
-            sb.append("DistributionPointName:\n     " + relativeName + "\n");
+            sb.append("DistributionPointName:\n     ").append(relativeName).append("\n");
         }
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/PolicyInformation.java
--- a/src/share/classes/sun/security/x509/PolicyInformation.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/PolicyInformation.java	Sun Aug 10 18:02:01 2014 -0300
@@ -259,7 +259,7 @@
      */
     public String toString() {
         StringBuilder s = new StringBuilder("  [" + policyIdentifier.toString());
-        s.append(policyQualifiers + "  ]\n");
+        s.append(policyQualifiers).append("  ]\n");
         return s.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLEntryImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Sun Aug 10 18:02:01 2014 -0300
@@ -292,17 +292,17 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append(serialNumber.toString());
-        sb.append("  On: " + revocationDate.toString());
+        sb.append("  On: ").append(revocationDate.toString());
         if (certIssuer != null) {
-            sb.append("\n    Certificate issuer: " + certIssuer);
+            sb.append("\n    Certificate issuer: ").append(certIssuer);
         }
         if (extensions != null) {
             Collection<Extension> allEntryExts = extensions.getAllExtensions();
             Extension[] exts = allEntryExts.toArray(new Extension[0]);
 
-            sb.append("\n    CRL Entry Extensions: " + exts.length);
+            sb.append("\n    CRL Entry Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n    [" + (i+1) + "]: ");
+                sb.append("\n    [").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -313,9 +313,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append("\n");
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLImpl.java	Sun Aug 10 18:02:01 2014 -0300
@@ -537,31 +537,32 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("X.509 CRL v" + (version+1) + "\n");
+        sb.append("X.509 CRL v").append(version + 1).append("\n");
         if (sigAlgId != null)
-            sb.append("Signature Algorithm: " + sigAlgId.toString() +
-                  ", OID=" + (sigAlgId.getOID()).toString() + "\n");
+            sb.append("Signature Algorithm: ").append(sigAlgId.toString())
+                    .append(", OID=")
+                    .append((sigAlgId.getOID()).toString()).append("\n");
         if (issuer != null)
-            sb.append("Issuer: " + issuer.toString() + "\n");
+            sb.append("Issuer: ").append(issuer.toString()).append("\n");
         if (thisUpdate != null)
-            sb.append("\nThis Update: " + thisUpdate.toString() + "\n");
+            sb.append("\nThis Update: ").append(thisUpdate.toString()).append("\n");
         if (nextUpdate != null)
-            sb.append("Next Update: " + nextUpdate.toString() + "\n");
+            sb.append("Next Update: ").append(nextUpdate.toString()).append("\n");
         if (revokedList.isEmpty())
             sb.append("\nNO certificates have been revoked\n");
         else {
-            sb.append("\nRevoked Certificates: " + revokedList.size());
+            sb.append("\nRevoked Certificates: ").append(revokedList.size());
             int i = 1;
             for (X509CRLEntry entry: revokedList) {
-                sb.append("\n[" + i++ + "] " + entry.toString());
+                sb.append("\n[").append(i++).append("] ").append(entry.toString());
             }
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Object[] objs = allExts.toArray();
-            sb.append("\nCRL Extensions: " + objs.length);
+            sb.append("\nCRL Extensions: ").append(objs.length);
             for (int i = 0; i < objs.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = (Extension)objs[i];
                 try {
                    if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -572,9 +573,8 @@
                            out.putOctetString(extValue);
                            extValue = out.toByteArray();
                            HexDumpEncoder enc = new HexDumpEncoder();
-                           sb.append("Extension unknown: "
-                                     + "DER encoded OCTET string =\n"
-                                     + enc.encodeBuffer(extValue) + "\n");
+                           sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                   .append(enc.encodeBuffer(extValue)).append("\n");
                       }
                    } else
                        sb.append(ext.toString()); // sub-class exists
@@ -585,8 +585,7 @@
         }
         if (signature != null) {
             HexDumpEncoder encoder = new HexDumpEncoder();
-            sb.append("\nSignature:\n" + encoder.encodeBuffer(signature)
-                      + "\n");
+            sb.append("\nSignature:\n").append(encoder.encodeBuffer(signature)).append("\n");
         } else
             sb.append("NOT signed yet\n");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertImpl.java
--- a/src/share/classes/sun/security/x509/X509CertImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertImpl.java	Sun Aug 10 18:02:01 2014 -0300
@@ -802,11 +802,11 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append(info.toString() + "\n");
-        sb.append("  Algorithm: [" + algId.toString() + "]\n");
+        sb.append(info.toString()).append("\n");
+        sb.append("  Algorithm: [").append(algId.toString()).append("]\n");
 
         HexDumpEncoder encoder = new HexDumpEncoder();
-        sb.append("  Signature:\n" + encoder.encodeBuffer(signature));
+        sb.append("  Signature:\n").append(encoder.encodeBuffer(signature));
         sb.append("\n]");
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertInfo.java
--- a/src/share/classes/sun/security/x509/X509CertInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertInfo.java	Sun Aug 10 18:02:01 2014 -0300
@@ -298,27 +298,27 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append("  " + version.toString() + "\n");
-        sb.append("  Subject: " + subject.toString() + "\n");
-        sb.append("  Signature Algorithm: " + algId.toString() + "\n");
-        sb.append("  Key:  " + pubKey.toString() + "\n");
-        sb.append("  " + interval.toString() + "\n");
-        sb.append("  Issuer: " + issuer.toString() + "\n");
-        sb.append("  " + serialNum.toString() + "\n");
+        sb.append("  ").append(version.toString()).append("\n");
+        sb.append("  Subject: ").append(subject.toString()).append("\n");
+        sb.append("  Signature Algorithm: ").append(algId.toString()).append("\n");
+        sb.append("  Key:  ").append(pubKey.toString()).append("\n");
+        sb.append("  ").append(interval.toString()).append("\n");
+        sb.append("  Issuer: ").append(issuer.toString()).append("\n");
+        sb.append("  ").append(serialNum.toString()).append("\n");
 
         // optional v2, v3 extras
         if (issuerUniqueId != null) {
-            sb.append("  Issuer Id:\n" + issuerUniqueId.toString() + "\n");
+            sb.append("  Issuer Id:\n").append(issuerUniqueId.toString()).append("\n");
         }
         if (subjectUniqueId != null) {
-            sb.append("  Subject Id:\n" + subjectUniqueId.toString() + "\n");
+            sb.append("  Subject Id:\n").append(subjectUniqueId.toString()).append("\n");
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Extension[] exts = allExts.toArray(new Extension[0]);
-            sb.append("\nCertificate Extensions: " + exts.length);
+            sb.append("\nCertificate Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -329,9 +329,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append("\n");
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
@@ -341,10 +340,10 @@
             }
             Map<String,Extension> invalid = extensions.getUnparseableExtensions();
             if (invalid.isEmpty() == false) {
-                sb.append("\nUnparseable certificate extensions: " + invalid.size());
+                sb.append("\nUnparseable certificate extensions: ").append(invalid.size());
                 int i = 1;
                 for (Extension ext : invalid.values()) {
-                    sb.append("\n[" + (i++) + "]: ");
+                    sb.append("\n[").append(i++).append("]: ");
                     sb.append(ext);
                 }
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
--- a/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Sun Aug 10 18:02:01 2014 -0300
@@ -465,10 +465,10 @@
 
     private static void appendIfLiteralAddress(String addr, StringBuffer sb) {
         if (IPAddressUtil.isIPv4LiteralAddress(addr)) {
-            sb.append("dns://" + addr + " ");
+            sb.append("dns://").append(addr).append(" ");
         } else {
             if (IPAddressUtil.isIPv6LiteralAddress(addr)) {
-                sb.append("dns://[" + addr + "] ");
+                sb.append("dns://[").append(addr).append("] ");
             }
         }
     }
diff -r dde9f5cfde5f src/share/classes/sun/net/www/HeaderParser.java
--- a/src/share/classes/sun/net/www/HeaderParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/HeaderParser.java	Sun Aug 10 18:02:01 2014 -0300
@@ -221,14 +221,14 @@
     public String toString () {
         Iterator<String> k = keys();
         StringBuffer sbuf = new StringBuffer();
-        sbuf.append ("{size="+asize+" nkeys="+nkeys+" ");
+        sbuf.append("{size=").append(asize).append(" nkeys=").append(nkeys).append(" ");
         for (int i=0; k.hasNext(); i++) {
             String key = k.next();
             String val = findValue (i);
             if (val != null && "".equals (val)) {
                 val = null;
             }
-            sbuf.append (" {"+key+(val==null?"":","+val)+"}");
+            sbuf.append(" {").append(key).append(val == null ? "" : "," + val).append("}");
             if (k.hasNext()) {
                 sbuf.append (",");
             }
diff -r dde9f5cfde5f src/share/classes/sun/net/www/MimeEntry.java
--- a/src/share/classes/sun/net/www/MimeEntry.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/MimeEntry.java	Sun Aug 10 18:02:01 2014 -0300
@@ -288,7 +288,7 @@
 
         int action = getAction();
         if (action != MimeEntry.UNKNOWN) {
-            sb.append("action=" + actionKeywords[action]);
+            sb.append("action=").append(actionKeywords[action]);
             needSeparator = true;
         }
 
@@ -297,7 +297,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("application=" + command);
+            sb.append("application=").append(command);
             needSeparator = true;
         }
 
@@ -305,7 +305,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("icon=" + getImageFileName());
+            sb.append("icon=").append(getImageFileName());
             needSeparator = true;
         }
 
@@ -314,7 +314,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("file_extensions=" + extensions);
+            sb.append("file_extensions=").append(extensions);
             needSeparator = true;
         }
 
@@ -323,7 +323,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("description=" + description);
+            sb.append("description=").append(description);
         }
 
         return sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/management/Agent.java
--- a/src/share/classes/sun/management/Agent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/Agent.java	Sun Aug 10 18:02:00 2014 -0300
@@ -502,7 +502,7 @@
         } else {
             StringBuilder message = new StringBuilder(params[0]);
             for (int i = 1; i < params.length; i++) {
-                message.append(" " + params[i]);
+                message.append(" ").append(params[i]);
             }
             error(key, message.toString());
         }
diff -r dde9f5cfde5f src/share/classes/sun/management/MappedMXBeanType.java
--- a/src/share/classes/sun/management/MappedMXBeanType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/MappedMXBeanType.java	Sun Aug 10 18:02:00 2014 -0300
@@ -289,7 +289,7 @@
             if (et.isPrimitive()) {
                 className = new StringBuilder(c.getName());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append("L").append(baseElementType.getTypeName()).append(";");
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
@@ -385,7 +385,7 @@
             if (elementType instanceof Class && ((Class) elementType).isPrimitive()) {
                 className = new StringBuilder(gat.toString());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append("L").append(baseElementType.getTypeName()).append(";");
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/launcher/LauncherHelper.java
--- a/src/share/classes/sun/launcher/LauncherHelper.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/launcher/LauncherHelper.java	Sun Aug 10 18:02:00 2014 -0300
@@ -370,8 +370,7 @@
         outBuf = outBuf.append(getLocalizedMessage("java.launcher.ergo.message1",
                 vm));
         outBuf = (isServerClass)
-             ? outBuf.append(",\n" +
-                getLocalizedMessage("java.launcher.ergo.message2") + "\n\n")
+             ? outBuf.append(",\n").append(getLocalizedMessage("java.launcher.ergo.message2")).append("\n\n")
              : outBuf.append(".\n\n");
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/font/AttributeValues.java
--- a/src/share/classes/sun/font/AttributeValues.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/AttributeValues.java	Sun Aug 10 18:02:00 2014 -0300
@@ -542,7 +542,7 @@
                 }
             }
         }
-        b.append("[btx=" + baselineTransform + ", ctx=" + charTransform + "]");
+        b.append("[btx=").append(baselineTransform).append(", ctx=").append(charTransform).append("]");
         b.append('}');
         return b.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/font/Decoration.java
--- a/src/share/classes/sun/font/Decoration.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/Decoration.java	Sun Aug 10 18:02:00 2014 -0300
@@ -431,12 +431,12 @@
             StringBuilder sb = new StringBuilder();
             sb.append(super.toString());
             sb.append("[");
-            if (fgPaint != null) sb.append("fgPaint: " + fgPaint);
-            if (bgPaint != null) sb.append(" bgPaint: " + bgPaint);
+            if (fgPaint != null) sb.append("fgPaint: ").append(fgPaint);
+            if (bgPaint != null) sb.append(" bgPaint: ").append(bgPaint);
             if (swapColors) sb.append(" swapColors: true");
             if (strikethrough) sb.append(" strikethrough: true");
-            if (stdUnderline != null) sb.append(" stdUnderline: " + stdUnderline);
-            if (imUnderline != null) sb.append(" imUnderline: " + imUnderline);
+            if (stdUnderline != null) sb.append(" stdUnderline: ").append(stdUnderline);
+            if (imUnderline != null) sb.append(" imUnderline: ").append(imUnderline);
             sb.append("]");
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/font/StandardGlyphVector.java
--- a/src/share/classes/sun/font/StandardGlyphVector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/StandardGlyphVector.java	Sun Aug 10 18:02:00 2014 -0300
@@ -1894,7 +1894,7 @@
             }
         }
         catch(Exception e) {
-            buf.append(" " + e.getMessage());
+            buf.append(" ").append(e.getMessage());
         }
         buf.append("}");
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/swing/GroupLayout.java
--- a/src/share/classes/javax/swing/GroupLayout.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/GroupLayout.java	Sun Aug 10 18:02:00 2014 -0300
@@ -1239,15 +1239,12 @@
             padding = ", userCreated=" + paddingSpring.getUserCreated() +
                     ", matches=" + paddingSpring.getMatchDescription();
         }
-        buffer.append(indent + spring.getClass().getName() + " " +
-                Integer.toHexString(spring.hashCode()) + " " +
-                origin +
-                ", size=" + spring.getSize() +
-                ", alignment=" + spring.getAlignment() +
-                " prefs=[" + spring.getMinimumSize(axis) +
-                " " + spring.getPreferredSize(axis) +
-                " " + spring.getMaximumSize(axis) +
-                padding + "]\n");
+        buffer.append(indent).append(spring.getClass().getName())
+                .append(" ").append(Integer.toHexString(spring.hashCode())).append(" ")
+                .append(origin).append(", size=").append(spring.getSize()).append(", alignment=")
+                .append(spring.getAlignment()).append(" prefs=[").append(spring.getMinimumSize(axis)).append(" ")
+                .append(spring.getPreferredSize(axis)).append(" ").append(spring.getMaximumSize(axis))
+                .append(padding).append("]\n");
         if (spring instanceof Group) {
             List<Spring> springs = ((Group)spring).springs;
             indent += "  ";
diff -r dde9f5cfde5f src/share/classes/javax/swing/JColorChooser.java
--- a/src/share/classes/javax/swing/JColorChooser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/JColorChooser.java	Sun Aug 10 18:02:00 2014 -0300
@@ -545,8 +545,7 @@
     protected String paramString() {
         StringBuilder chooserPanelsString = new StringBuilder("");
         for (int i=0; i<chooserPanels.length; i++) {
-            chooserPanelsString.append("[" + chooserPanels[i].toString()
-                                       + "]");
+            chooserPanelsString.append("[").append(chooserPanels[i].toString()).append("]");
         }
         String previewPanelString = (previewPanel != null ?
                                      previewPanel.toString() : "");
diff -r dde9f5cfde5f src/share/classes/javax/swing/MultiUIDefaults.java
--- a/src/share/classes/javax/swing/MultiUIDefaults.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/MultiUIDefaults.java	Sun Aug 10 18:02:00 2014 -0300
@@ -195,7 +195,7 @@
         Enumeration<?> keys = keys();
         while (keys.hasMoreElements()) {
             Object key = keys.nextElement();
-            sb.append(key + "=" + get(key) + ", ");
+            sb.append(key).append("=").append(get(key)).append(", ");
         }
         int length = sb.length();
         if (length > 1) {
diff -r dde9f5cfde5f src/share/classes/javax/swing/RepaintManager.java
--- a/src/share/classes/javax/swing/RepaintManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/RepaintManager.java	Sun Aug 10 18:02:00 2014 -0300
@@ -992,7 +992,7 @@
     public synchronized String toString() {
         StringBuilder sb = new StringBuilder();
         if(dirtyComponents != null)
-            sb.append("" + dirtyComponents);
+            sb.append("").append(dirtyComponents);
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/event/TreeModelEvent.java
--- a/src/share/classes/javax/swing/event/TreeModelEvent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/event/TreeModelEvent.java	Sun Aug 10 18:02:00 2014 -0300
@@ -294,20 +294,19 @@
     public String toString() {
         StringBuilder   sb = new StringBuilder();
 
-        sb.append(getClass().getName() + " " +
-                  Integer.toString(hashCode()));
+        sb.append(getClass().getName()).append(" ").append(Integer.toString(hashCode()));
         if(path != null)
-            sb.append(" path " + path);
+            sb.append(" path ").append(path);
         if(childIndices != null) {
             sb.append(" indices [ ");
             for(int counter = 0; counter < childIndices.length; counter++)
-                sb.append(Integer.toString(childIndices[counter])+ " ");
+                sb.append(Integer.toString(childIndices[counter])).append(" ");
             sb.append("]");
         }
         if(children != null) {
             sb.append(" children [ ");
             for(int counter = 0; counter < children.length; counter++)
-                sb.append(children[counter] + " ");
+                sb.append(children[counter]).append(" ");
             sb.append("]");
         }
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Sun Aug 10 18:02:00 2014 -0300
@@ -1330,8 +1330,8 @@
 
             for (Object obj : values) {
                 String val = ((obj == null) ? "" : obj.toString());
-                plainBuf.append(val + "\n");
-                htmlBuf.append("  <li>" + val + "\n");
+                plainBuf.append(val).append("\n");
+                htmlBuf.append("  <li>").append(val).append("\n");
             }
 
             // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicListUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Sun Aug 10 18:02:00 2014 -0300
@@ -2948,8 +2948,8 @@
                 for (int i = 0; i < values.length; i++) {
                     Object obj = values[i];
                     String val = ((obj == null) ? "" : obj.toString());
-                    plainStr.append(val + "\n");
-                    htmlStr.append("  <li>" + val + "\n");
+                    plainStr.append(val).append("\n");
+                    htmlStr.append("  <li>").append(val).append("\n");
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTableUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Sun Aug 10 18:02:00 2014 -0300
@@ -2230,8 +2230,8 @@
                     for (int col = 0; col < cols.length; col++) {
                         Object obj = table.getValueAt(rows[row], cols[col]);
                         String val = ((obj == null) ? "" : obj.toString());
-                        plainStr.append(val + "\t");
-                        htmlStr.append("  <td>" + val + "</td>\n");
+                        plainStr.append(val).append("\t");
+                        htmlStr.append("  <td>").append(val).append("</td>\n");
                     }
                     // we want a newline at the end of each line and not a tab
                     plainStr.deleteCharAt(plainStr.length() - 1).append("\n");
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Sun Aug 10 18:02:00 2014 -0300
@@ -3618,8 +3618,8 @@
                     boolean leaf = model.isLeaf(node);
                     String label = getDisplayString(path, true, leaf);
 
-                    plainStr.append(label + "\n");
-                    htmlStr.append("  <li>" + label + "\n");
+                    plainStr.append(label).append("\n");
+                    htmlStr.append("  <li>").append(label).append("\n");
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
--- a/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Sun Aug 10 18:02:00 2014 -0300
@@ -1160,13 +1160,13 @@
             rows = rowMapper.getRowsForPaths(selection);
         else
             rows = null;
-        sb.append(getClass().getName() + " " + hashCode() + " [ ");
+        sb.append(getClass().getName()).append(" ").append(hashCode()).append(" [ ");
         for(int counter = 0; counter < selCount; counter++) {
             if(rows != null)
-                sb.append(selection[counter].toString() + "@" +
-                          Integer.toString(rows[counter])+ " ");
+                sb.append(selection[counter].toString()).append("@")
+                        .append(Integer.toString(rows[counter])).append(" ");
             else
-                sb.append(selection[counter].toString() + " ");
+                sb.append(selection[counter].toString()).append(" ");
         }
         sb.append("]");
         return sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/AudioFileFormat.java
--- a/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Sun Aug 10 18:02:00 2014 -0300
@@ -276,19 +276,19 @@
 
         //$$fb2002-11-01: fix for 4672864: AudioFileFormat.toString() throws unexpected NullPointerException
         if (type != null) {
-            buf.append(type.toString() + " (." + type.getExtension() + ") file");
+            buf.append(type.toString()).append(" (.").append(type.getExtension()).append(") file");
         } else {
             buf.append("unknown file format");
         }
 
         if (byteLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", byte length: " + byteLength);
+            buf.append(", byte length: ").append(byteLength);
         }
 
-        buf.append(", data format: " + format);
+        buf.append(", data format: ").append(format);
 
         if (frameLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", frame length: " + frameLength);
+            buf.append(", frame length: ").append(frameLength);
         }
 
         return new String(buf);
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/DataLine.java
--- a/src/share/classes/javax/sound/sampled/DataLine.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/DataLine.java	Sun Aug 10 18:02:00 2014 -0300
@@ -473,17 +473,17 @@
             StringBuilder sb = new StringBuilder();
 
             if ( (formats.length == 1) && (formats[0] != null) ) {
-                sb.append(" supporting format " + formats[0]);
+                sb.append(" supporting format ").append(formats[0]);
             } else if (getFormats().length > 1) {
-                sb.append(" supporting " + getFormats().length + " audio formats");
+                sb.append(" supporting ").append(getFormats().length).append(" audio formats");
             }
 
             if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (maxBufferSize != AudioSystem.NOT_SPECIFIED) ) {
-                sb.append(", and buffers of " + minBufferSize + " to " + maxBufferSize + " bytes");
+                sb.append(", and buffers of ").append(minBufferSize).append(" to ").append(maxBufferSize).append(" bytes");
             } else if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (minBufferSize > 0) ) {
-                sb.append(", and buffers of at least " + minBufferSize + " bytes");
+                sb.append(", and buffers of at least ").append(minBufferSize).append(" bytes");
             } else if (maxBufferSize != AudioSystem.NOT_SPECIFIED) {
-                sb.append(", and buffers of up to " + minBufferSize + " bytes");
+                sb.append(", and buffers of up to ").append(minBufferSize).append(" bytes");
             }
 
             return new String(super.toString() + sb);
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
--- a/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Sun Aug 10 18:02:00 2014 -0300
@@ -651,8 +651,7 @@
         StringBuilder caddrString = new StringBuilder();
         if (clientAddresses != null) {
             for (int i = 0; i < clientAddresses.length; i++) {
-                caddrString.append("clientAddresses[" + i + "] = " +
-                        clientAddresses[i].toString());
+                caddrString.append("clientAddresses[").append(i).append("] = ").append(clientAddresses[i].toString());
             }
         }
         return ("Ticket (hex) = " + "\n" +
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/naming/BinaryRefAddr.java
--- a/src/share/classes/javax/naming/BinaryRefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/BinaryRefAddr.java	Sun Aug 10 18:02:00 2014 -0300
@@ -169,7 +169,7 @@
 
         str.append("AddressContents: ");
         for (int i = 0; i<buf.length && i < 32; i++) {
-            str.append(Integer.toHexString(buf[i]) +" ");
+            str.append(Integer.toHexString(buf[i])).append(" ");
         }
         if (buf.length >= 32)
             str.append(" ...\n");
diff -r dde9f5cfde5f src/share/classes/javax/naming/NameImpl.java
--- a/src/share/classes/javax/naming/NameImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/NameImpl.java	Sun Aug 10 18:02:00 2014 -0300
@@ -170,7 +170,7 @@
                 endQuote = one ? syntaxEndQuote1 : syntaxEndQuote2;
 
                 i += syntaxTypevalSeparator.length();
-                answer.append(syntaxTypevalSeparator+beginQuote); // add back
+                answer.append(syntaxTypevalSeparator).append(beginQuote); // add back
 
                 // consume string until matching quote
                 for (i += beginQuote.length();
diff -r dde9f5cfde5f src/share/classes/javax/naming/RefAddr.java
--- a/src/share/classes/javax/naming/RefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/RefAddr.java	Sun Aug 10 18:02:00 2014 -0300
@@ -141,7 +141,7 @@
     public String toString(){
         StringBuilder str = new StringBuilder("Type: " + addrType + "\n");
 
-        str.append("Content: " + getContent() + "\n");
+        str.append("Content: ").append(getContent()).append("\n");
         return (str.toString());
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/crypto/CryptoPermission.java
--- a/src/share/classes/javax/crypto/CryptoPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/crypto/CryptoPermission.java	Sun Aug 10 18:01:59 2014 -0300
@@ -370,18 +370,16 @@
      */
     public String toString() {
         StringBuilder buf = new StringBuilder(100);
-        buf.append("(CryptoPermission " + alg + " " + maxKeySize);
+        buf.append("(CryptoPermission ").append(alg).append(" ").append(maxKeySize);
         if (algParamSpec != null) {
             if (algParamSpec instanceof RC2ParameterSpec) {
-                buf.append(" , effective " +
-                    ((RC2ParameterSpec)algParamSpec).getEffectiveKeyBits());
+                buf.append(" , effective ").append(((RC2ParameterSpec) algParamSpec).getEffectiveKeyBits());
             } else if (algParamSpec instanceof RC5ParameterSpec) {
-                buf.append(" , rounds " +
-                    ((RC5ParameterSpec)algParamSpec).getRounds());
+                buf.append(" , rounds ").append(((RC5ParameterSpec) algParamSpec).getRounds());
             }
         }
         if (exemptionMechanism != null) { // OPTIONAL
-            buf.append(" " + exemptionMechanism);
+            buf.append(" ").append(exemptionMechanism);
         }
         buf.append(")");
         return buf.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/management/MBeanPermission.java
--- a/src/share/classes/javax/management/MBeanPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/MBeanPermission.java	Sun Aug 10 18:02:00 2014 -0300
@@ -455,7 +455,7 @@
         name.append(className);
         if (member == null)
             member = "-";
-        name.append("#" + member);
+        name.append("#").append(member);
         if (objectName == null)
             name.append("[-]");
         else
diff -r dde9f5cfde5f src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
--- a/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Sun Aug 10 18:02:00 2014 -0300
@@ -716,13 +716,12 @@
         }
 
         retStr.append("\nMBeanInfo for ModelMBean is:");
-        retStr.append("\nCLASSNAME: \t"+ info.getClassName());
-        retStr.append("\nDESCRIPTION: \t"+ info.getDescription());
+        retStr.append("\nCLASSNAME: \t").append(info.getClassName());
+        retStr.append("\nDESCRIPTION: \t").append(info.getDescription());
 
 
         try {
-            retStr.append("\nMBEAN DESCRIPTOR: \t"+
-                          info.getMBeanDescriptor());
+            retStr.append("\nMBEAN DESCRIPTOR: \t").append(info.getMBeanDescriptor());
         } catch (Exception e) {
             retStr.append("\nMBEAN DESCRIPTOR: \t" + " is invalid");
         }
@@ -734,13 +733,12 @@
             for (int i=0; i<attrInfo.length; i++) {
                 final ModelMBeanAttributeInfo attInfo =
                     (ModelMBeanAttributeInfo)attrInfo[i];
-                retStr.append(" ** NAME: \t"+ attInfo.getName());
-                retStr.append("    DESCR: \t"+ attInfo.getDescription());
-                retStr.append("    TYPE: \t"+ attInfo.getType() +
-                              "    READ: \t"+ attInfo.isReadable() +
-                              "    WRITE: \t"+ attInfo.isWritable());
-                retStr.append("    DESCRIPTOR: " +
-                              attInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(attInfo.getName());
+                retStr.append("    DESCR: \t").append(attInfo.getDescription());
+                retStr.append("    TYPE: \t").append(attInfo.getType())
+                        .append("    READ: \t").append(attInfo.isReadable())
+                        .append("    WRITE: \t").append(attInfo.isWritable());
+                retStr.append("    DESCRIPTOR: ").append(attInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No attributes **");
@@ -752,14 +750,12 @@
             for (int i=0; i<constrInfo.length; i++) {
                 final ModelMBeanConstructorInfo ctorInfo =
                     (ModelMBeanConstructorInfo)constrInfo[i];
-                retStr.append(" ** NAME: \t"+ ctorInfo.getName());
-                retStr.append("    DESCR: \t"+
-                              ctorInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              ctorInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              ctorInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(ctorInfo.getName());
+                retStr.append("    DESCR: \t").append(ctorInfo.getDescription());
+                retStr.append("    PARAM: \t").append(ctorInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ")
+                        .append(ctorInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No Constructors **");
@@ -771,13 +767,11 @@
             for (int i=0; i<opsInfo.length; i++) {
                 final ModelMBeanOperationInfo operInfo =
                     (ModelMBeanOperationInfo)opsInfo[i];
-                retStr.append(" ** NAME: \t"+ operInfo.getName());
-                retStr.append("    DESCR: \t"+ operInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              operInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              operInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(operInfo.getName());
+                retStr.append("    DESCR: \t").append(operInfo.getDescription());
+                retStr.append("    PARAM: \t").append(operInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ").append(operInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No operations ** ");
@@ -790,10 +784,9 @@
             for (int i=0; i<notifInfo.length; i++) {
                 final ModelMBeanNotificationInfo nInfo =
                     (ModelMBeanNotificationInfo)notifInfo[i];
-                retStr.append(" ** NAME: \t"+ nInfo.getName());
-                retStr.append("    DESCR: \t"+ nInfo.getDescription());
-                retStr.append("    DESCRIPTOR: " +
-                              nInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(nInfo.getName());
+                retStr.append("    DESCR: \t").append(nInfo.getDescription());
+                retStr.append("    DESCRIPTOR: ").append(nInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No notifications **");
diff -r dde9f5cfde5f src/share/classes/javax/management/openmbean/CompositeType.java
--- a/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/openmbean/CompositeType.java	Sun Aug 10 18:02:00 2014 -0300
@@ -45,6 +45,7 @@
  *
  * @since 1.5
  */
+ at SuppressWarnings("StringConcatenationInsideStringBufferAppend")
 public class CompositeType extends OpenType<CompositeData> {
 
     /* Serial version */
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/Role.java
--- a/src/share/classes/javax/management/relation/Role.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/Role.java	Sun Aug 10 18:02:00 2014 -0300
@@ -227,7 +227,7 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role name: " + name + "; role value: ");
+        result.append("role name: ").append(name).append("; role value: ");
         for (Iterator<ObjectName> objNameIter = objectNameList.iterator();
              objNameIter.hasNext();) {
             ObjectName currObjName = objNameIter.next();
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleInfo.java
--- a/src/share/classes/javax/management/relation/RoleInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleInfo.java	Sun Aug 10 18:02:00 2014 -0300
@@ -456,13 +456,13 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role info name: " + name);
-        result.append("; isReadable: " + isReadable);
-        result.append("; isWritable: " + isWritable);
-        result.append("; description: " + description);
-        result.append("; minimum degree: " + minDegree);
-        result.append("; maximum degree: " + maxDegree);
-        result.append("; MBean class: " + referencedMBeanClassName);
+        result.append("role info name: ").append(name);
+        result.append("; isReadable: ").append(isReadable);
+        result.append("; isWritable: ").append(isWritable);
+        result.append("; description: ").append(description);
+        result.append("; minimum degree: ").append(minDegree);
+        result.append("; maximum degree: ").append(maxDegree);
+        result.append("; MBean class: ").append(referencedMBeanClassName);
         return result.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleUnresolved.java
--- a/src/share/classes/javax/management/relation/RoleUnresolved.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleUnresolved.java	Sun Aug 10 18:02:00 2014 -0300
@@ -282,7 +282,7 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role name: " + roleName);
+        result.append("role name: ").append(roleName);
         if (roleValue != null) {
             result.append("; value: ");
             for (Iterator<ObjectName> objNameIter = roleValue.iterator();
@@ -294,7 +294,7 @@
                 }
             }
         }
-        result.append("; problem type: " + problemType);
+        result.append("; problem type: ").append(problemType);
         return result.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/util/Scanner.java
--- a/src/share/classes/java/util/Scanner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/Scanner.java	Sun Aug 10 18:01:59 2014 -0300
@@ -1304,20 +1304,20 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.Scanner");
-        sb.append("[delimiters=" + delimPattern + "]");
-        sb.append("[position=" + position + "]");
-        sb.append("[match valid=" + matchValid + "]");
-        sb.append("[need input=" + needInput + "]");
-        sb.append("[source closed=" + sourceClosed + "]");
-        sb.append("[skipped=" + skipped + "]");
-        sb.append("[group separator=" + groupSeparator + "]");
-        sb.append("[decimal separator=" + decimalSeparator + "]");
-        sb.append("[positive prefix=" + positivePrefix + "]");
-        sb.append("[negative prefix=" + negativePrefix + "]");
-        sb.append("[positive suffix=" + positiveSuffix + "]");
-        sb.append("[negative suffix=" + negativeSuffix + "]");
-        sb.append("[NaN string=" + nanString + "]");
-        sb.append("[infinity string=" + infinityString + "]");
+        sb.append("[delimiters=").append(delimPattern).append("]");
+        sb.append("[position=").append(position).append("]");
+        sb.append("[match valid=").append(matchValid).append("]");
+        sb.append("[need input=").append(needInput).append("]");
+        sb.append("[source closed=").append(sourceClosed).append("]");
+        sb.append("[skipped=").append(skipped).append("]");
+        sb.append("[group separator=").append(groupSeparator).append("]");
+        sb.append("[decimal separator=").append(decimalSeparator).append("]");
+        sb.append("[positive prefix=").append(positivePrefix).append("]");
+        sb.append("[negative prefix=").append(negativePrefix).append("]");
+        sb.append("[positive suffix=").append(positiveSuffix).append("]");
+        sb.append("[negative suffix=").append(negativeSuffix).append("]");
+        sb.append("[NaN string=").append(nanString).append("]");
+        sb.append("[infinity string=").append(infinityString).append("]");
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Matcher.java
--- a/src/share/classes/java/util/regex/Matcher.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Matcher.java	Sun Aug 10 18:01:59 2014 -0300
@@ -1295,9 +1295,9 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.regex.Matcher");
-        sb.append("[pattern=" + pattern());
+        sb.append("[pattern=").append(pattern());
         sb.append(" region=");
-        sb.append(regionStart() + "," + regionEnd());
+        sb.append(regionStart()).append(",").append(regionEnd());
         sb.append(" lastmatch=");
         if ((first >= 0) && (group() != null)) {
             sb.append(group());
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Pattern.java
--- a/src/share/classes/java/util/regex/Pattern.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Pattern.java	Sun Aug 10 18:01:59 2014 -0300
@@ -1488,10 +1488,10 @@
         for(int x=0; x<perms.length; x++) {
             String next = base + perms[x];
             if (x>0)
-                result.append("|"+next);
+                result.append("|").append(next);
             next = composeOneStep(next);
             if (next != null)
-                result.append("|"+produceEquivalentAlternation(next));
+                result.append("|").append(produceEquivalentAlternation(next));
         }
         return result.toString();
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/text/ChoiceFormat.java
--- a/src/share/classes/java/text/ChoiceFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/text/ChoiceFormat.java	Sun Aug 10 18:01:59 2014 -0300
@@ -272,7 +272,7 @@
             double tryLess = Math.abs(Math.IEEEremainder(less, 1.0d));
 
             if (tryLessOrEqual < tryLess) {
-                result.append(""+choiceLimits[i]);
+                result.append("").append(choiceLimits[i]);
                 result.append('#');
             } else {
                 if (choiceLimits[i] == Double.POSITIVE_INFINITY) {
@@ -280,7 +280,7 @@
                 } else if (choiceLimits[i] == Double.NEGATIVE_INFINITY) {
                     result.append("-\u221E");
                 } else {
-                    result.append(""+less);
+                    result.append("").append(less);
                 }
                 result.append('<');
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSigner.java
--- a/src/share/classes/java/security/CodeSigner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSigner.java	Sun Aug 10 18:01:59 2014 -0300
@@ -156,9 +156,9 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("Signer: " + signerCertPath.getCertificates().get(0));
+        sb.append("Signer: ").append(signerCertPath.getCertificates().get(0));
         if (timestamp != null) {
-            sb.append("timestamp: " + timestamp);
+            sb.append("timestamp: ").append(timestamp);
         }
         sb.append(")");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSource.java
--- a/src/share/classes/java/security/CodeSource.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSource.java	Sun Aug 10 18:01:59 2014 -0300
@@ -468,12 +468,12 @@
 
         if (this.certs != null && this.certs.length > 0) {
             for (int i = 0; i < this.certs.length; i++) {
-                sb.append( " " + this.certs[i]);
+                sb.append(" ").append(this.certs[i]);
             }
 
         } else if (this.signers != null && this.signers.length > 0) {
             for (int i = 0; i < this.signers.length; i++) {
-                sb.append( " " + this.signers[i]);
+                sb.append(" ").append(this.signers[i]);
             }
         } else {
             sb.append(" <no signer certificates>");
diff -r dde9f5cfde5f src/share/classes/java/security/KeyStore.java
--- a/src/share/classes/java/security/KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/KeyStore.java	Sun Aug 10 18:01:59 2014 -0300
@@ -610,8 +610,7 @@
          */
         public String toString() {
             StringBuilder sb = new StringBuilder();
-            sb.append("Private key entry and certificate chain with "
-                + chain.length + " elements:\r\n");
+            sb.append("Private key entry and certificate chain with ").append(chain.length).append(" elements:\r\n");
             for (Certificate cert : chain) {
                 sb.append(cert);
                 sb.append("\r\n");
diff -r dde9f5cfde5f src/share/classes/java/security/PermissionCollection.java
--- a/src/share/classes/java/security/PermissionCollection.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/PermissionCollection.java	Sun Aug 10 18:01:59 2014 -0300
@@ -179,7 +179,7 @@
     public String toString() {
         Enumeration<Permission> enum_ = elements();
         StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()+" (\n");
+        sb.append(super.toString()).append(" (\n");
         while (enum_.hasMoreElements()) {
             try {
                 sb.append(" ");
diff -r dde9f5cfde5f src/share/classes/java/security/ProtectionDomain.java
--- a/src/share/classes/java/security/ProtectionDomain.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/ProtectionDomain.java	Sun Aug 10 18:01:59 2014 -0300
@@ -291,9 +291,9 @@
             StringBuilder palBuf = new StringBuilder("(principals ");
 
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                            " \"" + principals[i].getName() +
-                            "\"");
+                palBuf.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append("\"");
                 if (i < principals.length-1)
                     palBuf.append(",\n");
                 else
diff -r dde9f5cfde5f src/share/classes/java/security/Timestamp.java
--- a/src/share/classes/java/security/Timestamp.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/Timestamp.java	Sun Aug 10 18:01:59 2014 -0300
@@ -143,10 +143,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("timestamp: " + timestamp);
+        sb.append("timestamp: ").append(timestamp);
         List<? extends Certificate> certs = signerCertPath.getCertificates();
         if (!certs.isEmpty()) {
-            sb.append("TSA: " + certs.get(0));
+            sb.append("TSA: ").append(certs.get(0));
         } else {
             sb.append("TSA: <empty>");
         }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CertPath.java
--- a/src/share/classes/java/security/cert/CertPath.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CertPath.java	Sun Aug 10 18:01:59 2014 -0300
@@ -224,17 +224,16 @@
         Iterator<? extends Certificate> stringIterator =
                                         getCertificates().iterator();
 
-        sb.append("\n" + type + " Cert Path: length = "
-            + getCertificates().size() + ".\n");
+        sb.append("\n").append(type).append(" Cert Path: length = ").append(getCertificates().size()).append(".\n");
         sb.append("[\n");
         int i = 1;
         while (stringIterator.hasNext()) {
-            sb.append("=========================================="
-                + "===============Certificate " + i + " start.\n");
+            sb.append("==========================================" + "===============Certificate ")
+                    .append(i).append(" start.\n");
             Certificate stringCert = stringIterator.next();
             sb.append(stringCert.toString());
-            sb.append("\n========================================"
-                + "=================Certificate " + i + " end.\n\n\n");
+            sb.append("\n========================================" + "=================Certificate ")
+                    .append(i).append(" end.\n\n\n");
             i++;
         }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CollectionCertStoreParameters.java
--- a/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Sun Aug 10 18:01:59 2014 -0300
@@ -134,7 +134,7 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CollectionCertStoreParameters: [\n");
-        sb.append("  collection: " + coll + "\n");
+        sb.append("  collection: ").append(coll).append("\n");
         sb.append("]");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/LDAPCertStoreParameters.java
--- a/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Sun Aug 10 18:01:59 2014 -0300
@@ -141,8 +141,8 @@
         StringBuilder sb = new StringBuilder();
         sb.append("LDAPCertStoreParameters: [\n");
 
-        sb.append("  serverName: " + serverName + "\n");
-        sb.append("  port: " + port + "\n");
+        sb.append("  serverName: ").append(serverName).append("\n");
+        sb.append("  port: ").append(port).append("\n");
         sb.append("]");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXBuilderParameters.java
--- a/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Sun Aug 10 18:01:59 2014 -0300
@@ -192,7 +192,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Maximum Path Length: " + maxPathLength + "\n");
+        sb.append("  Maximum Path Length: ").append(maxPathLength).append("\n");
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Sun Aug 10 18:01:59 2014 -0300
@@ -109,10 +109,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathBuilderResult: [\n");
-        sb.append("  Certification Path: " + certPath + "\n");
-        sb.append("  Trust Anchor: " + getTrustAnchor().toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(getPolicyTree()) + "\n");
-        sb.append("  Subject Public Key: " + getPublicKey() + "\n");
+        sb.append("  Certification Path: ").append(certPath).append("\n");
+        sb.append("  Trust Anchor: ").append(getTrustAnchor().toString()).append("\n");
+        sb.append("  Policy Tree: ").append(String.valueOf(getPolicyTree())).append("\n");
+        sb.append("  Subject Public Key: ").append(getPublicKey()).append("\n");
         sb.append("]");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Sun Aug 10 18:01:59 2014 -0300
@@ -150,9 +150,9 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathValidatorResult: [\n");
-        sb.append("  Trust Anchor: " + trustAnchor.toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(policyTree) + "\n");
-        sb.append("  Subject Public Key: " + subjectPublicKey + "\n");
+        sb.append("  Trust Anchor: ").append(trustAnchor.toString()).append("\n");
+        sb.append("  Policy Tree: ").append(String.valueOf(policyTree)).append("\n");
+        sb.append("  Subject Public Key: ").append(subjectPublicKey).append("\n");
         sb.append("]");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXParameters.java
--- a/src/share/classes/java/security/cert/PKIXParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXParameters.java	Sun Aug 10 18:01:59 2014 -0300
@@ -698,8 +698,7 @@
 
         /* start with trusted anchor info */
         if (unmodTrustAnchors != null) {
-            sb.append("  Trust Anchors: " + unmodTrustAnchors.toString()
-                + "\n");
+            sb.append("  Trust Anchors: ").append(unmodTrustAnchors.toString()).append("\n");
         }
 
         /* now, append initial state information */
@@ -707,29 +706,27 @@
             if (unmodInitialPolicies.isEmpty()) {
                 sb.append("  Initial Policy OIDs: any\n");
             } else {
-                sb.append("  Initial Policy OIDs: ["
-                    + unmodInitialPolicies.toString() + "]\n");
+                sb.append("  Initial Policy OIDs: [").append(unmodInitialPolicies.toString()).append("]\n");
             }
         }
 
         /* now, append constraints on all certificates in the path */
-        sb.append("  Validity Date: " + String.valueOf(date) + "\n");
-        sb.append("  Signature Provider: " + String.valueOf(sigProvider) + "\n");
-        sb.append("  Default Revocation Enabled: " + revocationEnabled + "\n");
-        sb.append("  Explicit Policy Required: " + explicitPolicyRequired + "\n");
-        sb.append("  Policy Mapping Inhibited: " + policyMappingInhibited + "\n");
-        sb.append("  Any Policy Inhibited: " + anyPolicyInhibited + "\n");
-        sb.append("  Policy Qualifiers Rejected: " + policyQualifiersRejected + "\n");
+        sb.append("  Validity Date: ").append(String.valueOf(date)).append("\n");
+        sb.append("  Signature Provider: ").append(String.valueOf(sigProvider)).append("\n");
+        sb.append("  Default Revocation Enabled: ").append(revocationEnabled).append("\n");
+        sb.append("  Explicit Policy Required: ").append(explicitPolicyRequired).append("\n");
+        sb.append("  Policy Mapping Inhibited: ").append(policyMappingInhibited).append("\n");
+        sb.append("  Any Policy Inhibited: ").append(anyPolicyInhibited).append("\n");
+        sb.append("  Policy Qualifiers Rejected: ").append(policyQualifiersRejected).append("\n");
 
         /* now, append target cert requirements */
-        sb.append("  Target Cert Constraints: " + String.valueOf(certSelector) + "\n");
+        sb.append("  Target Cert Constraints: ").append(String.valueOf(certSelector)).append("\n");
 
         /* finally, append miscellaneous parameters */
         if (certPathCheckers != null)
-            sb.append("  Certification Path Checkers: ["
-                + certPathCheckers.toString() + "]\n");
+            sb.append("  Certification Path Checkers: [").append(certPathCheckers.toString()).append("]\n");
         if (certStores != null)
-            sb.append("  CertStores: [" + certStores.toString() + "]\n");
+            sb.append("  CertStores: [").append(certStores.toString()).append("]\n");
         sb.append("]");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PolicyQualifierInfo.java
--- a/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Sun Aug 10 18:01:59 2014 -0300
@@ -163,9 +163,8 @@
         HexDumpEncoder enc = new HexDumpEncoder();
         StringBuilder sb = new StringBuilder();
         sb.append("PolicyQualifierInfo: [\n");
-        sb.append("  qualifierID: " + mId + "\n");
-        sb.append("  qualifier: " +
-            (mData == null ? "null" : enc.encodeBuffer(mData)) + "\n");
+        sb.append("  qualifierID: ").append(mId).append("\n");
+        sb.append("  qualifier: ").append(mData == null ? "null" : enc.encodeBuffer(mData)).append("\n");
         sb.append("]");
         pqiString = sb.toString();
         return pqiString;
diff -r dde9f5cfde5f src/share/classes/java/security/cert/TrustAnchor.java
--- a/src/share/classes/java/security/cert/TrustAnchor.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/TrustAnchor.java	Sun Aug 10 18:01:59 2014 -0300
@@ -320,14 +320,13 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         if (pubKey != null) {
-            sb.append("  Trusted CA Public Key: " + pubKey.toString() + "\n");
-            sb.append("  Trusted CA Issuer Name: "
-                + String.valueOf(caName) + "\n");
+            sb.append("  Trusted CA Public Key: ").append(pubKey.toString()).append("\n");
+            sb.append("  Trusted CA Issuer Name: ").append(String.valueOf(caName)).append("\n");
         } else {
-            sb.append("  Trusted CA cert: " + trustedCert.toString() + "\n");
+            sb.append("  Trusted CA cert: ").append(trustedCert.toString()).append("\n");
         }
         if (nc != null)
-            sb.append("  Name Constraints: " + nc.toString() + "\n");
+            sb.append("  Name Constraints: ").append(nc.toString()).append("\n");
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CRLSelector.java
--- a/src/share/classes/java/security/cert/X509CRLSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CRLSelector.java	Sun Aug 10 18:01:59 2014 -0300
@@ -572,16 +572,16 @@
             sb.append("  IssuerNames:\n");
             Iterator<Object> i = issuerNames.iterator();
             while (i.hasNext())
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append("\n");
         }
         if (minCRL != null)
-            sb.append("  minCRLNumber: " + minCRL + "\n");
+            sb.append("  minCRLNumber: ").append(minCRL).append("\n");
         if (maxCRL != null)
-            sb.append("  maxCRLNumber: " + maxCRL + "\n");
+            sb.append("  maxCRLNumber: ").append(maxCRL).append("\n");
         if (dateAndTime != null)
-            sb.append("  dateAndTime: " + dateAndTime + "\n");
+            sb.append("  dateAndTime: ").append(dateAndTime).append("\n");
         if (certChecking != null)
-            sb.append("  Certificate being checked: " + certChecking + "\n");
+            sb.append("  Certificate being checked: ").append(certChecking).append("\n");
         sb.append("]");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CertSelector.java
--- a/src/share/classes/java/security/cert/X509CertSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CertSelector.java	Sun Aug 10 18:01:59 2014 -0300
@@ -1814,69 +1814,62 @@
         StringBuilder sb = new StringBuilder();
         sb.append("X509CertSelector: [\n");
         if (x509Cert != null) {
-            sb.append("  Certificate: " + x509Cert.toString() + "\n");
+            sb.append("  Certificate: ").append(x509Cert.toString()).append("\n");
         }
         if (serialNumber != null) {
-            sb.append("  Serial Number: " + serialNumber.toString() + "\n");
+            sb.append("  Serial Number: ").append(serialNumber.toString()).append("\n");
         }
         if (issuer != null) {
-            sb.append("  Issuer: " + getIssuerAsString() + "\n");
+            sb.append("  Issuer: ").append(getIssuerAsString()).append("\n");
         }
         if (subject != null) {
-            sb.append("  Subject: " + getSubjectAsString() + "\n");
+            sb.append("  Subject: ").append(getSubjectAsString()).append("\n");
         }
-        sb.append("  matchAllSubjectAltNames flag: "
-                  + String.valueOf(matchAllSubjectAltNames) + "\n");
+        sb.append("  matchAllSubjectAltNames flag: ")
+                .append(String.valueOf(matchAllSubjectAltNames))
+                .append("\n");
         if (subjectAlternativeNames != null) {
             sb.append("  SubjectAlternativeNames:\n");
             Iterator<List<?>> i = subjectAlternativeNames.iterator();
             while (i.hasNext()) {
                 List<?> list = i.next();
-                sb.append("    type " + list.get(0) +
-                          ", name " + list.get(1) + "\n");
+                sb.append("    type ").append(list.get(0)).append(", name ").append(list.get(1)).append("\n");
             }
         }
         if (subjectKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Subject Key Identifier: " +
-                      enc.encodeBuffer(subjectKeyID) + "\n");
+            sb.append("  Subject Key Identifier: ").append(enc.encodeBuffer(subjectKeyID)).append("\n");
         }
         if (authorityKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Authority Key Identifier: " +
-                      enc.encodeBuffer(authorityKeyID) + "\n");
+            sb.append("  Authority Key Identifier: ").append(enc.encodeBuffer(authorityKeyID)).append("\n");
         }
         if (certificateValid != null) {
-            sb.append("  Certificate Valid: " +
-                      certificateValid.toString() + "\n");
+            sb.append("  Certificate Valid: ").append(certificateValid.toString()).append("\n");
         }
         if (privateKeyValid != null) {
-            sb.append("  Private Key Valid: " +
-                      privateKeyValid.toString() + "\n");
+            sb.append("  Private Key Valid: ").append(privateKeyValid.toString()).append("\n");
         }
         if (subjectPublicKeyAlgID != null) {
-            sb.append("  Subject Public Key AlgID: " +
-                      subjectPublicKeyAlgID.toString() + "\n");
+            sb.append("  Subject Public Key AlgID: ").append(subjectPublicKeyAlgID.toString()).append("\n");
         }
         if (subjectPublicKey != null) {
-            sb.append("  Subject Public Key: " +
-                      subjectPublicKey.toString() + "\n");
+            sb.append("  Subject Public Key: ").append(subjectPublicKey.toString()).append("\n");
         }
         if (keyUsage != null) {
-            sb.append("  Key Usage: " + keyUsageToString(keyUsage) + "\n");
+            sb.append("  Key Usage: ").append(keyUsageToString(keyUsage)).append("\n");
         }
         if (keyPurposeSet != null) {
-            sb.append("  Extended Key Usage: " +
-                      keyPurposeSet.toString() + "\n");
+            sb.append("  Extended Key Usage: ").append(keyPurposeSet.toString()).append("\n");
         }
         if (policy != null) {
-            sb.append("  Policy: " + policy.toString() + "\n");
+            sb.append("  Policy: ").append(policy.toString()).append("\n");
         }
         if (pathToGeneralNames != null) {
             sb.append("  Path to names:\n");
             Iterator<GeneralNameInterface> i = pathToGeneralNames.iterator();
             while (i.hasNext()) {
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append("\n");
             }
         }
         sb.append("]");
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/rmi/dgc/VMID.java
--- a/src/share/classes/java/rmi/dgc/VMID.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/rmi/dgc/VMID.java	Sun Aug 10 18:01:59 2014 -0300
@@ -124,8 +124,7 @@
         if (addr != null)
             for (int i = 0; i < addr.length; ++ i) {
                 int x = addr[i] & 0xFF;
-                sb.append((x < 0x10 ? "0" : "") +
-                          Integer.toString(x, 16));
+                sb.append(x < 0x10 ? "0" : "").append(Integer.toString(x, 16));
             }
         sb.append(':');
         sb.append(uid.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/lang/management/MemoryUsage.java
--- a/src/share/classes/java/lang/management/MemoryUsage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/MemoryUsage.java	Sun Aug 10 18:01:59 2014 -0300
@@ -238,11 +238,10 @@
      */
     public String toString() {
         StringBuilder buf = new StringBuilder();
-        buf.append("init = " + init + "(" + (init >> 10) + "K) ");
-        buf.append("used = " + used + "(" + (used >> 10) + "K) ");
-        buf.append("committed = " + committed + "(" +
-                   (committed >> 10) + "K) " );
-        buf.append("max = " + max + "(" + (max >> 10) + "K)");
+        buf.append("init = ").append(init).append("(").append(init >> 10).append("K) ");
+        buf.append("used = ").append(used).append("(").append(used >> 10).append("K) ");
+        buf.append("committed = ").append(committed).append("(").append(committed >> 10).append("K) ");
+        buf.append("max = ").append(max).append("(").append(max >> 10).append("K)");
         return buf.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/lang/management/ThreadInfo.java
--- a/src/share/classes/java/lang/management/ThreadInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/ThreadInfo.java	Sun Aug 10 18:01:59 2014 -0300
@@ -583,11 +583,11 @@
                                              " Id=" + getThreadId() + " " +
                                              getThreadState());
         if (getLockName() != null) {
-            sb.append(" on " + getLockName());
+            sb.append(" on ").append(getLockName());
         }
         if (getLockOwnerName() != null) {
-            sb.append(" owned by \"" + getLockOwnerName() +
-                      "\" Id=" + getLockOwnerId());
+            sb.append(" owned by \"").append(getLockOwnerName())
+                    .append("\" Id=").append(getLockOwnerId());
         }
         if (isSuspended()) {
             sb.append(" (suspended)");
@@ -599,21 +599,21 @@
         int i = 0;
         for (; i < stackTrace.length && i < MAX_FRAMES; i++) {
             StackTraceElement ste = stackTrace[i];
-            sb.append("\tat " + ste.toString());
+            sb.append("\tat ").append(ste.toString());
             sb.append('\n');
             if (i == 0 && getLockInfo() != null) {
                 Thread.State ts = getThreadState();
                 switch (ts) {
                     case BLOCKED:
-                        sb.append("\t-  blocked on " + getLockInfo());
+                        sb.append("\t-  blocked on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case TIMED_WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     default:
@@ -622,7 +622,7 @@
 
             for (MonitorInfo mi : lockedMonitors) {
                 if (mi.getLockedStackDepth() == i) {
-                    sb.append("\t-  locked " + mi);
+                    sb.append("\t-  locked ").append(mi);
                     sb.append('\n');
                 }
             }
@@ -634,10 +634,10 @@
 
        LockInfo[] locks = getLockedSynchronizers();
        if (locks.length > 0) {
-           sb.append("\n\tNumber of locked synchronizers = " + locks.length);
+           sb.append("\n\tNumber of locked synchronizers = ").append(locks.length);
            sb.append('\n');
            for (LockInfo li : locks) {
-               sb.append("\t- " + li);
+               sb.append("\t- ").append(li);
                sb.append('\n');
            }
        }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHParameters.java
--- a/src/share/classes/com/sun/crypto/provider/DHParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHParameters.java	Sun Aug 10 18:01:59 2014 -0300
@@ -138,7 +138,7 @@
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
         if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+            sb.append(LINE_SEP).append("l:").append(LINE_SEP).append("    ").append(this.l);
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHPublicKey.java
--- a/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Sun Aug 10 18:01:59 2014 -0300
@@ -269,7 +269,7 @@
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
         if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+            sb.append(LINE_SEP).append("l:").append(LINE_SEP).append("    ").append(this.l);
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/GCMParameters.java
--- a/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Sun Aug 10 18:01:59 2014 -0300
@@ -140,7 +140,7 @@
             = new StringBuilder(LINE_SEP + "    iv:" + LINE_SEP + "["
                 + encoder.encodeBuffer(iv) + "]");
 
-        sb.append(LINE_SEP + "tLen(bits):" + LINE_SEP + tLen*8 + LINE_SEP);
+        sb.append(LINE_SEP).append("tLen(bits):").append(LINE_SEP).append(tLen * 8).append(LINE_SEP);
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/OAEPParameters.java
--- a/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Sun Aug 10 18:01:59 2014 -0300
@@ -239,10 +239,9 @@
 
     protected String engineToString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("MD: " + mdName + "\n");
-        sb.append("MGF: MGF1" + mgfSpec.getDigestAlgorithm() + "\n");
-        sb.append("PSource: PSpecified " +
-            (p.length==0? "":Debug.toHexString(new BigInteger(p))) + "\n");
+        sb.append("MD: ").append(mdName).append("\n");
+        sb.append("MGF: MGF1").append(mgfSpec.getDigestAlgorithm()).append("\n");
+        sb.append("PSource: PSpecified ").append(p.length == 0 ? "" : Debug.toHexString(new BigInteger(p))).append("\n");
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/RC2Parameters.java
--- a/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Sun Aug 10 18:01:59 2014 -0300
@@ -221,8 +221,9 @@
                 + encoder.encodeBuffer(iv) + "]");
 
         if (version != 0) {
-            sb.append(LINE_SEP + "version:" + LINE_SEP
-                + version + LINE_SEP);
+            sb.append(LINE_SEP).append("version:")
+                    .append(LINE_SEP).append(version)
+                    .append(LINE_SEP);
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Sun Aug 10 18:01:59 2014 -0300
@@ -65,7 +65,7 @@
                 "extractSubNet", "BINARY ARRAY :");
             StringBuilder sb = new StringBuilder();
             for(int i =0; i < addrLength; i++) {
-                sb.append((b[i] & 0xFF) + ":");
+                sb.append(b[i] & 0xFF).append(":");
             }
             SNMP_LOGGER.logp(Level.FINEST, NetMaskImpl.class.getName(),
                 "extractSubNet", sb.toString());
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Sun Aug 10 18:01:59 2014 -0300
@@ -204,7 +204,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Sun Aug 10 18:01:59 2014 -0300
@@ -379,7 +379,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(IDENTIFIER);
-   jjtn000.name.append( "." + t.image);
+   jjtn000.name.append(".").append(t.image);
       }
     } finally {
     if (jjtc000) {
@@ -408,7 +408,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append(".").append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -454,7 +454,7 @@
         }
         jj_consume_token(MARK);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append(".").append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -483,7 +483,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append(".").append(t.image);
       }
       jj_consume_token(MASK);
       t = jj_consume_token(INTEGER_LITERAL);
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Sun Aug 10 18:01:59 2014 -0300
@@ -99,7 +99,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java
--- a/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Sun Aug 10 18:01:59 2014 -0300
@@ -479,10 +479,10 @@
      */
     public String printMessage() {
         StringBuilder sb = new StringBuilder();
-        sb.append("msgId : " + msgId + "\n");
-        sb.append("msgMaxSize : " + msgMaxSize + "\n");
-        sb.append("msgFlags : " + msgFlags + "\n");
-        sb.append("msgSecurityModel : " + msgSecurityModel + "\n");
+        sb.append("msgId : ").append(msgId).append("\n");
+        sb.append("msgMaxSize : ").append(msgMaxSize).append("\n");
+        sb.append("msgFlags : ").append(msgFlags).append("\n");
+        sb.append("msgSecurityModel : ").append(msgSecurityModel).append("\n");
 
         if (contextEngineId == null) {
             sb.append("contextEngineId : null");
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
--- a/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Sun Aug 10 18:01:59 2014 -0300
@@ -256,7 +256,7 @@
     private static String stringifyComponent(NameComponent comp) {
         StringBuilder one = new StringBuilder(escape(comp.id));
         if (comp.kind != null && !comp.kind.equals("")) {
-            one.append(kindSeparator + escape(comp.kind));
+            one.append(kindSeparator).append(escape(comp.kind));
         }
         if (one.length() == 0) {
             return ""+kindSeparator;  // if neither id nor kind specified
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java
--- a/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Sun Aug 10 18:01:59 2014 -0300
@@ -90,7 +90,7 @@
                         if (selected == -1) {
                             StringBuilder allChoices = new StringBuilder();
                             for (int j = 0; j <  choices.length; j++) {
-                                allChoices.append(choices[j] + ",");
+                                allChoices.append(choices[j]).append(",");
                             }
                             throw new IOException("Cannot match " +
                                 "'java.naming.security.sasl.realm' property value, '" +
diff -r dde9f5cfde5f src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
--- a/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Sun Aug 10 18:01:59 2014 -0300
@@ -167,9 +167,9 @@
         for (int i = 0; i < allchannelnames.length; i++) {
             if ((channelmask & m) != 0L) {
                 if (i < channelnames.length) {
-                    sb.append(channelnames[i] + " ");
+                    sb.append(channelnames[i]).append(" ");
                 } else {
-                    sb.append(allchannelnames[i] + " ");
+                    sb.append(allchannelnames[i]).append(" ");
                 }
             }
             m *= 2L;
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Sun Aug 10 18:01:59 2014 -0300
@@ -235,14 +235,14 @@
                     String nodeName = att.getNodeName();
                     if ((nodeName.equals("xmlns") || nodeName.startsWith("xmlns:"))
                         && !storedNamespaces.containsKey(att.getNodeName())) {
-                        sb.append(" " + nodeName + "=\"" + att.getNodeValue() + "\"");
+                        sb.append(" ").append(nodeName).append("=\"").append(att.getNodeValue()).append("\"");
                         storedNamespaces.put(nodeName, att.getNodeValue());
                     }
                 }
             }
             wk = wk.getParentNode();
         }
-        sb.append(">" + source + "</dummy>");
+        sb.append(">").append(source).append("</dummy>");
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Sun Aug 10 18:01:59 2014 -0300
@@ -85,7 +85,7 @@
             if (prefix.equals("xmlns")) {
                 sb.append("#default ");
             } else {
-                sb.append(prefix + " ");
+                sb.append(prefix).append(" ");
             }
         }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Sun Aug 10 18:01:59 2014 -0300
@@ -88,7 +88,7 @@
                 l += countQuotes(DN, j, k);
 
                 if ((k > 0) && (DN.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml) + ",");
+                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml)).append(",");
 
                     i = k + 1;
                     l = 0;
@@ -121,7 +121,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(parseATAV(trim(str.substring(i, k)), toXml) + "+");
+                sb.append(parseATAV(trim(str.substring(i, k)), toXml)).append("+");
 
                 i = k + 1;
                 l = 0;
@@ -369,7 +369,7 @@
         int k;
 
         for (int j = 0; (k = string.indexOf("\\20", j)) >= 0; j = k + 3) {
-            sb.append(trim(string.substring(i, k)) + "\\ ");
+            sb.append(trim(string.substring(i, k))).append("\\ ");
 
             i = k + 3;
         }
@@ -418,7 +418,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(trim(str.substring(i, k)) + replace);
+                sb.append(trim(str.substring(i, k))).append(replace);
 
                 i = k + 1;
                 l = 0;
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/CramMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Sun Aug 10 18:01:59 2014 -0300
@@ -196,8 +196,7 @@
 
         for (i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append("0").append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Sun Aug 10 18:01:59 2014 -0300
@@ -391,8 +391,7 @@
 
         for (int i = 0; i < digest.length; i ++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0"+
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append("0").append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/ParseException.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Sun Aug 10 18:01:59 2014 -0300
@@ -198,7 +198,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Sun Aug 10 18:01:59 2014 -0300
@@ -107,7 +107,7 @@
         default:
           if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
             String s = "0000" + Integer.toString(ch, 16);
-            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+            retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
           } else {
             retval.append(ch);
           }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
--- a/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Sun Aug 10 18:01:59 2014 -0300
@@ -338,10 +338,10 @@
             if (classpath.isEmpty()) {
                 String envcp = System.getProperty("env.class.path");
                 if ((envcp != null) && (envcp.length() > 0)) {
-                    munged.append(" -classpath " + envcp);
+                    munged.append(" -classpath ").append(envcp);
                 }
             } else {
-                munged.append(" -classpath " + classpath.asString());
+                munged.append(" -classpath ").append(classpath.asString());
             }
             return munged.toString();
         } else {
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Sun Aug 10 18:01:59 2014 -0300
@@ -386,37 +386,37 @@
                     }
                     case 'B': {
                         int val = 0xFF & byteAt(i, value);
-                        result.append("0x" + Integer.toString(val, 16));
+                        result.append("0x").append(Integer.toString(val, 16));
                         i++;
                         break;
                     }
                     case 'S': {
                         short val = shortAt(i, value);
                         i += 2;
-                        result.append("" + val);
+                        result.append("").append(val);
                         break;
                     }
                     case 'I': {
                         int val = intAt(i, value);
                         i += 4;
-                        result.append("" + val);
+                        result.append("").append(val);
                         break;
                     }
                     case 'J': {         // long
                         long val = longAt(i, value);
-                        result.append("" + val);
+                        result.append("").append(val);
                         i += 8;
                         break;
                     }
                     case 'F': {
                         float val = floatAt(i, value);
-                        result.append("" + val);
+                        result.append("").append(val);
                         i += 4;
                         break;
                     }
                     case 'D': {         // double
                         double val = doubleAt(i, value);
-                        result.append("" + val);
+                        result.append("").append(val);
                         i += 8;
                         break;
                     }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/util/Misc.java
--- a/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Sun Aug 10 18:01:59 2014 -0300
@@ -97,11 +97,11 @@
             } else if (ch == '&') {
                 sb.append("&amp;");
             } else if (ch < ' ') {
-                sb.append("&#" + Integer.toString(ch) + ";");
+                sb.append("&#").append(Integer.toString(ch)).append(";");
             } else {
                 int c = (ch & 0xFFFF);
                 if (c > 127) {
-                    sb.append("&#" + Integer.toString(c) + ";");
+                    sb.append("&#").append(Integer.toString(c)).append(";");
                 } else {
                     sb.append(ch);
                 }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
--- a/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Sun Aug 10 18:01:59 2014 -0300
@@ -881,12 +881,12 @@
             } else if (tag == JDWP.TypeTag.ARRAY) {
                 sb.append("ArrayType");
             } else {
-                sb.append("UNKNOWN TAG: " + tag);
+                sb.append("UNKNOWN TAG: ").append(tag);
             }
             if (signature != null) {
-                sb.append(", signature='" + signature + "'");
+                sb.append(", signature='").append(signature).append("'");
             }
-            sb.append(", id=" + id);
+            sb.append(", id=").append(id);
             vm.printTrace(sb.toString());
         }
         if (id == 0) {

From otaviojava at java.net  Mon Aug 11 03:29:39 2014
From: otaviojava at java.net (=?UTF-8?Q?Ot=C3=A1vio_Gon=C3=A7alves_de_Santana?=)
Date: Mon, 11 Aug 2014 00:29:39 -0300
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <53E7FA44.9050207@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
Message-ID: <CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>

Done.

https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_2.zip

obs: stay the 2 chars to better performance.


On Sun, Aug 10, 2014 at 8:03 PM, Claes Redestad <claes.redestad at oracle.com>
wrote:

> +1
>
> Some suggestions (mostly nits):
>
> - in places like src/share/classes/java/util/regex/Pattern.java you
> introducesingle-char
>   strings which might use a char instead:
>
> -                result.append("|"+next);
> +                result.append('|').append(next);
>
> - in places like src/share/classes/sun/security/provider/PolicyFile.java
>   you end up with a sequence of String literal appends which could be
> merged into one:
>
> -                sb.append(principalInfo[i][0] + " " +
> -                    "\"" + principalInfo[i][1] + "\"");
> +                sb.append(principalInfo[i][0]).append(" \"")
> +                    .append(principalInfo[i][1]).append('"');
>
> - in some places like src/share/classes/java/text/ChoiceFormat.java
>   you end up doing append(""). I guess the empty string concatenation was
> used as a form
>   of primitive-to-string coercion and was probably always redundant
> already, but care needs
>   to be taken that doing the append directly behave as intended.
>
>   I think it should be safe to just remove the empty string append in most
> cases:
>
> -                result.append(""+choiceLimits[i]);
> +                result.append(choiceLimits[i]);
>
> Thanks!
>
> /Claes
>
> On 2014-08-10 23:33, Ot?vio Gon?alves de Santana wrote:
>
>> *Motivation:* Make another append instead of concat String inside of
>> append
>>
>> parameter in StringBuilder class. To avoid an extra StringBuilder created
>> for the purpose of concatenating. So it will save memory and will faster
>> than concat String.
>> Doing a code to benchMark[1], the result is:
>>
>> Benchmark                                                  Mode   Samples
>>        Mean   Mean error    Units
>> m.StringBuilderConcatBenchMark.stringBuilder              thrpt        10
>>   6317444.705   108673.584    ops/s
>> m.StringBuilderConcatBenchMark.stringBuilderWithConcat    thrpt        10
>>   3354554.435    68353.924    ops/s
>>
>> The webrev of all code is:
>> https://dl.dropboxusercontent.com/u/16109193/open_jdk/
>> string_builder_concat.zip
>> <https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_
>> builder_concat.zip>
>>
>> [1]
>>
>> @State(Scope.Thread)
>> @OutputTimeUnit(TimeUnit.SECONDS)
>> public class StringBuilderConcatBenchMark {
>>
>>
>>          private static final String F = "!!!!";
>>   private static final String E = " running in Java ";
>> private static final String D = " in the code ";
>>   private static final String C = " to try impact ";
>> private static final String B = " with some text ";
>>   private static final String A = "Doing a test";
>>
>> @GenerateMicroBenchmark
>> public void stringBuilder(BlackHole bh) {
>>   bh.consume(createBuilder(A, B, C, D, E, F));
>> }
>>
>> @GenerateMicroBenchmark
>>   public void stringBuilderWithConcat(BlackHole bh) {
>> bh.consume(createBuilderWithConcat(A, B, C, D, E, F));
>>   }
>>
>> private StringBuilder createBuilder(String... values) {
>> StringBuilder text = new StringBuilder();
>>   text.append(values[0]).append(values[1])
>> .append(values[2]).append(values[3])
>> .append(values[4]).append(values[5]);
>>   return text;
>> }
>>   private StringBuilder createBuilderWithConcat(String... values) {
>>   StringBuilder text = new StringBuilder();
>> text.append(values[0] + values[1])
>> .append(values[2] + values[3])
>>   .append(values[4]+ values[5]);
>> return text;
>> }
>> }
>>
>>
>


-- 
Ot?vio Gon?alves de Santana

blog:     http://otaviosantana.blogspot.com.br/
twitter: http://twitter.com/otaviojava
site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
55 (11) 98255-3513
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140811/2295b01e/attachment.html>
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/ThreadTab.java
--- a/src/share/classes/sun/tools/jconsole/ThreadTab.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/ThreadTab.java	Sun Aug 10 22:07:00 2014 -0300
@@ -368,7 +368,7 @@
                             sb.append(Messages.STACK_TRACE);
                             int index = 0;
                             for (StackTraceElement e : ti.getStackTrace()) {
-                                sb.append(e.toString()+"\n");
+                                sb.append(e.toString()).append('\n');
                                 if (monitors != null) {
                                     for (MonitorInfo mi : monitors) {
                                         if (mi.getLockedStackDepth() == index) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Sun Aug 10 22:07:00 2014 -0300
@@ -79,25 +79,24 @@
             String textColor = String.format("%06x",
                                              foreground.getRGB() & 0xFFFFFF);
             StringBuilder sb = new StringBuilder();
-            sb.append("<html><body text=#"+textColor+"><table width=\"100%\">");
+            sb.append("<html><body text=#").append(textColor).append("><table width=\"100%\">");
             for (int i = 0; i < arr.length; i++) {
                 if (i % 2 == 0) {
-                    sb.append("<tr style=\"background-color: " +
-                            evenRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(evenRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 } else {
-                    sb.append("<tr style=\"background-color: " +
-                            oddRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(oddRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 }
             }
             if (arr.length == 0) {
-                sb.append("<tr style=\"background-color: " +
-                        evenRowColorStr + "\"><td></td></tr>");
+                sb.append("<tr style=\"background-color: ").append(evenRowColorStr).append("\"><td></td></tr>");
             }
             sb.append("</table></body></html>");
             arrayEditor.setText(sb.toString());
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XTree.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Sun Aug 10 22:07:00 2014 -0300
@@ -507,13 +507,13 @@
         // key order defined by the "orderedKeyPropertyList"
         for (String key : orderedKeyPropertyList) {
             if (map.containsKey(key)) {
-                sb.append(key + "=" + map.get(key) + ",");
+                sb.append(key).append('=').append(map.get(key)).append(',');
                 map.remove(key);
             }
         }
         // Add the remaining key/value pairs to the buffer
         for (Map.Entry<String, String> entry : map.entrySet()) {
-            sb.append(entry.getKey() + "=" + entry.getValue() + ",");
+            sb.append(entry.getKey()).append('=').append(entry.getValue()).append(',');
         }
         String orderedKeyPropertyListString = sb.toString();
         orderedKeyPropertyListString = orderedKeyPropertyListString.substring(
@@ -622,7 +622,7 @@
                     //
                     StringBuilder sb = new StringBuilder();
                     for (MBeanParameterInfo mbpi : mboi.getSignature()) {
-                        sb.append(mbpi.getType() + ",");
+                        sb.append(mbpi.getType()).append(',');
                     }
                     String signature = sb.toString();
                     if (signature.length() > 0) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jps/Jps.java
--- a/src/share/classes/sun/tools/jps/Jps.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jps/Jps.java	Sun Aug 10 22:07:00 2014 -0300
@@ -92,28 +92,28 @@
                     vm = monitoredHost.getMonitoredVm(id, 0);
 
                     errorString = " -- main class information unavailable";
-                    output.append(" " + MonitoredVmUtil.mainClass(vm,
+                    output.append(' ').append(MonitoredVmUtil.mainClass(vm,
                             arguments.showLongPaths()));
 
                     if (arguments.showMainArgs()) {
                         errorString = " -- main args information unavailable";
                         String mainArgs = MonitoredVmUtil.mainArgs(vm);
                         if (mainArgs != null && mainArgs.length() > 0) {
-                            output.append(" " + mainArgs);
+                            output.append(' ').append(mainArgs);
                         }
                     }
                     if (arguments.showVmArgs()) {
                         errorString = " -- jvm args information unavailable";
                         String jvmArgs = MonitoredVmUtil.jvmArgs(vm);
                         if (jvmArgs != null && jvmArgs.length() > 0) {
-                          output.append(" " + jvmArgs);
+                          output.append(' ').append(jvmArgs);
                         }
                     }
                     if (arguments.showVmFlags()) {
                         errorString = " -- jvm flags information unavailable";
                         String jvmFlags = MonitoredVmUtil.jvmFlags(vm);
                         if (jvmFlags != null && jvmFlags.length() > 0) {
-                            output.append(" " + jvmFlags);
+                            output.append(' ').append(jvmFlags);
                         }
                     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/RawOutputFormatter.java
--- a/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Sun Aug 10 22:07:00 2014 -0300
@@ -50,7 +50,7 @@
             StringBuilder headerBuilder = new StringBuilder();
             for (Iterator<Monitor> i = logged.iterator(); i.hasNext(); /* empty */ ) {
                 Monitor m = i.next();
-                headerBuilder.append(m.getName() + " ");
+                headerBuilder.append(m.getName()).append(' ');
             }
             header = headerBuilder.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/SyntaxException.java
--- a/src/share/classes/sun/tools/jstat/SyntaxException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/SyntaxException.java	Sun Aug 10 22:07:00 2014 -0300
@@ -65,7 +65,7 @@
     public SyntaxException(int lineno, Set<String> expected, Token found) {
         StringBuilder msg = new StringBuilder();
 
-        msg.append("Syntax error at line " + lineno + ": Expected one of \'");
+        msg.append("Syntax error at line ").append(lineno).append(": Expected one of \'");
 
         boolean first = true;
         for (Iterator<String> i = expected.iterator(); i.hasNext(); /* empty */) {
@@ -74,11 +74,11 @@
                 msg.append(keyWord);
                 first = false;
             } else {
-                msg.append("|" + keyWord);
+                msg.append('|').append(keyWord);
             }
         }
 
-        msg.append("\', Found " + found.toMessage());
+        msg.append("\', Found ").append(found.toMessage());
         message = msg.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/Token.java
--- a/src/share/classes/sun/tools/jstat/Token.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/Token.java	Sun Aug 10 22:07:00 2014 -0300
@@ -89,18 +89,18 @@
             sb.append("ttype=TT_EOF");
             break;
         case StreamTokenizer.TT_NUMBER:
-            sb.append("ttype=TT_NUM,").append("nval="+nval);
+            sb.append("ttype=TT_NUM,").append("nval=").append(nval);
             break;
         case StreamTokenizer.TT_WORD:
             if (sval == null) {
                 sb.append("ttype=TT_WORD:IDENTIFIER");
             } else {
-                sb.append("ttype=TT_WORD:").append("sval="+sval);
+                sb.append("ttype=TT_WORD:").append("sval=").append(sval);
             }
             break;
         default:
             if (ttype == (int)'"') {
-                sb.append("ttype=TT_STRING:").append("sval="+sval);
+                sb.append("ttype=TT_STRING:").append("sval=").append(sval);
             } else {
                 sb.append("ttype=TT_CHAR:").append((char)ttype);
             }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstatd/RemoteHostImpl.java
--- a/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Sun Aug 10 22:07:00 2014 -0300
@@ -68,7 +68,7 @@
 
         sb.append("local://").append(lvmid).append("@localhost");
         if (mode != null) {
-            sb.append("?mode=" + mode);
+            sb.append("?mode=").append(mode);
         }
 
         String vmidStr = sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/security/acl/AclEntryImpl.java
--- a/src/share/classes/sun/security/acl/AclEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/acl/AclEntryImpl.java	Sun Aug 10 22:07:00 2014 -0300
@@ -147,13 +147,13 @@
             s.append("Group.");
         else
             s.append("User.");
-        s.append(user + "=");
+        s.append(user).append('=');
         Enumeration<Permission> e = permissions();
         while(e.hasMoreElements()) {
             Permission p = e.nextElement();
             s.append(p);
             if (e.hasMoreElements())
-                s.append(",");
+                s.append(',');
         }
         return new String(s);
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
--- a/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Sun Aug 10 22:07:00 2014 -0300
@@ -640,8 +640,7 @@
 
         for (int i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
--- a/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Sun Aug 10 22:07:00 2014 -0300
@@ -158,8 +158,8 @@
         }
         sb.append(hexDumper.encode(certHash));
         if (issuer != null && serialNumber != null) {
-            sb.append("\n\tIssuer: " + issuer + "\n");
-            sb.append("\t" + serialNumber);
+            sb.append("\n\tIssuer: ").append(issuer).append('\n');
+            sb.append('\t').append(serialNumber);
         }
         sb.append("\n]");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs11/P11KeyStore.java
--- a/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Sun Aug 10 22:07:00 2014 -0300
@@ -196,24 +196,24 @@
             } else if (type == ATTR_CLASS_CERT) {
                 sb.append("\ttype=[trusted cert]\n");
             }
-            sb.append("\tlabel=[" + label + "]\n");
+            sb.append("\tlabel=[").append(label).append("]\n");
             if (id == null) {
                 sb.append("\tid=[null]\n");
             } else {
-                sb.append("\tid=" + P11KeyStore.getID(id) + "\n");
+                sb.append("\tid=").append(P11KeyStore.getID(id)).append('\n');
             }
-            sb.append("\ttrusted=[" + trusted + "]\n");
-            sb.append("\tmatched=[" + matched + "]\n");
+            sb.append("\ttrusted=[").append(trusted).append("]\n");
+            sb.append("\tmatched=[").append(matched).append("]\n");
             if (cert == null) {
                 sb.append("\tcert=[null]\n");
             } else {
-                sb.append("\tcert=[\tsubject: " +
-                        cert.getSubjectX500Principal() +
-                        "\n\t\tissuer: " +
-                        cert.getIssuerX500Principal() +
-                        "\n\t\tserialNum: " +
-                        cert.getSerialNumber().toString() +
-                        "]");
+                sb.append("\tcert=[\tsubject: ")
+                        .append(cert.getSubjectX500Principal())
+                        .append("\n\t\tissuer: ")
+                        .append(cert.getIssuerX500Principal())
+                        .append("\n\t\tserialNum: ")
+                        .append(cert.getSerialNumber().toString())
+                        .append(']');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/PolicyFile.java
--- a/src/share/classes/sun/security/provider/PolicyFile.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/PolicyFile.java	Sun Aug 10 22:07:00 2014 -0300
@@ -1500,8 +1500,7 @@
                     if (i != 0) {
                         sb.append(", ");
                     }
-                    sb.append(principalInfo[i][0] + " " +
-                        "\"" + principalInfo[i][1] + "\"");
+                    sb.append(principalInfo[i][0]).append(' ').append('\"').append(principalInfo[i][1]).append('\"');
                 }
                 if (pli.hasNext()) {
                     sb.append(", ");
@@ -1776,13 +1775,13 @@
         if (principals != null && principals.length > 0) {
             StringBuilder palBuf = new StringBuilder("(principals ");
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                              " \"" + principals[i].getName() +
-                              "\"");
+                palBuf.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append('\"');
                 if (i < principals.length-1)
                     palBuf.append(", ");
                 else
-                    palBuf.append(")");
+                    palBuf.append(')');
             }
             pals = palBuf.toString();
         }
@@ -1884,7 +1883,7 @@
                     throw new Exception(form.format(source));
                 }
 
-                sb.append(X500PRINCIPAL + " \"" + suffix + "\"");
+                sb.append(X500PRINCIPAL).append(" \"").append(suffix).append('\"');
                 startIndex = e+2;
             } else {
                 MessageFormat form = new MessageFormat
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/CertId.java
--- a/src/share/classes/sun/security/provider/certpath/CertId.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/CertId.java	Sun Aug 10 22:07:00 2014 -0300
@@ -223,13 +223,13 @@
     @Override public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CertId \n");
-        sb.append("Algorithm: " + hashAlgId.toString() +"\n");
+        sb.append("Algorithm: ").append(hashAlgId.toString()).append('\n');
         sb.append("issuerNameHash \n");
         HexDumpEncoder encoder = new HexDumpEncoder();
         sb.append(encoder.encode(issuerNameHash));
         sb.append("\nissuerKeyHash: \n");
         sb.append(encoder.encode(issuerKeyHash));
-        sb.append("\n" +  certSerialNumber.toString());
+        sb.append('\n').append(certSerialNumber.toString());
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/OCSPResponse.java
--- a/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Sun Aug 10 22:07:00 2014 -0300
@@ -812,14 +812,14 @@
             StringBuilder sb = new StringBuilder();
             sb.append("SingleResponse:  \n");
             sb.append(certId);
-            sb.append("\nCertStatus: "+ certStatus + "\n");
+            sb.append("\nCertStatus: ").append(certStatus).append('\n');
             if (certStatus == CertStatus.REVOKED) {
-                sb.append("revocationTime is " + revocationTime + "\n");
-                sb.append("revocationReason is " + revocationReason + "\n");
+                sb.append("revocationTime is ").append(revocationTime).append('\n');
+                sb.append("revocationReason is ").append(revocationReason).append('\n');
             }
-            sb.append("thisUpdate is " + thisUpdate + "\n");
+            sb.append("thisUpdate is ").append(thisUpdate).append('\n');
             if (nextUpdate != null) {
-                sb.append("nextUpdate is " + nextUpdate + "\n");
+                sb.append("nextUpdate is ").append(nextUpdate).append('\n');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
--- a/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Sun Aug 10 22:07:00 2014 -0300
@@ -124,7 +124,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Build Forward Flag: " + String.valueOf(buildForward) + "\n");
+        sb.append("  Build Forward Flag: ").append(String.valueOf(buildForward)).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/HandshakeMessage.java
--- a/src/share/classes/sun/security/ssl/HandshakeMessage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/HandshakeMessage.java	Sun Aug 10 22:07:00 2014 -0300
@@ -1478,7 +1478,7 @@
                 boolean opened = false;
                 for (SignatureAndHashAlgorithm signAlg : algorithms) {
                     if (opened) {
-                        sb.append(", " + signAlg.getAlgorithmName());
+                        sb.append(", ").append(signAlg.getAlgorithmName());
                     } else {
                         sb.append(signAlg.getAlgorithmName());
                         opened = true;
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/ServerNameExtension.java
--- a/src/share/classes/sun/security/ssl/ServerNameExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/ServerNameExtension.java	Sun Aug 10 22:07:00 2014 -0300
@@ -268,7 +268,7 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         for (SNIServerName sniName : sniMap.values()) {
-            sb.append("[" + sniName + "]");
+            sb.append('[').append(sniName).append(']');
         }
 
         return "Extension " + type + ", server_name: " + sb;
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
--- a/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Sun Aug 10 22:07:00 2014 -0300
@@ -122,7 +122,7 @@
         boolean opened = false;
         for (SignatureAndHashAlgorithm signAlg : algorithms) {
             if (opened) {
-                sb.append(", " + signAlg.getAlgorithmName());
+                sb.append(", ").append(signAlg.getAlgorithmName());
             } else {
                 sb.append(signAlg.getAlgorithmName());
                 opened = true;
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
--- a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Sun Aug 10 22:07:00 2014 -0300
@@ -113,7 +113,7 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("Extension " + type + ", curve names: {");
+        sb.append("Extension ").append(type).append(", curve names: {");
         boolean first = true;
         for (int curveId : curveIds) {
             if (first) {
@@ -138,7 +138,7 @@
             } else if (curveId == ARBITRARY_CHAR2) {
                 sb.append("arbitrary_explicit_char2_curves");
             } else {
-                sb.append("unknown curve " + curveId);
+                sb.append("unknown curve ").append(curveId);
             }
         }
         sb.append("}");
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/jarsigner/Main.java
--- a/src/share/classes/sun/security/tools/jarsigner/Main.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/jarsigner/Main.java	Sun Aug 10 22:07:00 2014 -0300
@@ -676,14 +676,13 @@
                             ((man.getAttributes(name) != null) ||
                              (man.getAttributes("./"+name) != null) ||
                              (man.getAttributes("/"+name) != null));
-                        sb.append(
-                          (isSigned ? rb.getString("s") : rb.getString("SPACE")) +
-                          (inManifest ? rb.getString("m") : rb.getString("SPACE")) +
-                          (inStore ? rb.getString("k") : rb.getString("SPACE")) +
-                          (inScope ? rb.getString("i") : rb.getString("SPACE")) +
-                          ((inStoreOrScope & NOT_ALIAS) != 0 ?"X":" ") +
-                          rb.getString("SPACE"));
-                        sb.append("|");
+                        sb.append(isSigned ? rb.getString("s") : rb.getString("SPACE"))
+                                .append(inManifest ? rb.getString("m") : rb.getString("SPACE"))
+                                .append(inStore ? rb.getString("k") : rb.getString("SPACE"))
+                                .append(inScope ? rb.getString("i") : rb.getString("SPACE"))
+                                .append((inStoreOrScope & NOT_ALIAS) != 0 ? 'X' : ' ')
+                                .append(rb.getString("SPACE"));
+                        sb.append('|');
                     }
 
                     // When -certs provided, display info has extra empty
@@ -704,11 +703,11 @@
                         // Print no info for unsigned entries when -verbose:all,
                         // to be consistent with old behavior.
                         if (signatureRelated(name)) {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Signature.related.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(rb.getString(
+                                    ".Signature.related.entries.")).append("\n\n");
                         } else {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Unsigned.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(rb.getString(
+                                    ".Unsigned.entries.")).append("\n\n");
                         }
                     }
 
@@ -1605,8 +1604,8 @@
                 // No more warning, we alreay have hasExpiredCert or notYetValidCert
             } else {
                 chainNotValidated = true;
-                sb.append(tab + rb.getString(".CertPath.not.validated.") +
-                        e.getLocalizedMessage() + "]\n");   // TODO
+                sb.append(tab).append(rb.getString(".CertPath.not.validated."))
+                        .append(e.getLocalizedMessage()).append("]\n");   // TODO
             }
         }
         String result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/policytool/PolicyTool.java
--- a/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Sun Aug 10 22:07:00 2014 -0300
@@ -980,8 +980,9 @@
                                 grantEntry.principals.listIterator();
             while (list.hasNext()) {
                 PolicyParser.PrincipalEntry pppe = list.next();
-                sb.append(" Principal " + pppe.getDisplayClass() + " " +
-                    pppe.getDisplayName(true));
+                sb.append(" Principal ").append(pppe.getDisplayClass())
+                        .append(' ')
+                        .append(pppe.getDisplayName(true));
                 if (list.hasNext()) sb.append(", ");
             }
             result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/AVA.java
--- a/src/share/classes/sun/security/x509/AVA.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/AVA.java	Sun Aug 10 22:07:00 2014 -0300
@@ -1147,7 +1147,7 @@
                 // Emit the string ... quote it if needed
                 // if string is already quoted, don't re-quote
                 if (!alreadyQuoted && quoteNeeded) {
-                    retval.append("\"" + sbuffer.toString() + "\"");
+                    retval.append('\"').append(sbuffer.toString()).append('\"');
                 } else {
                     retval.append(sbuffer.toString());
                 }
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPoint.java
--- a/src/share/classes/sun/security/x509/DistributionPoint.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPoint.java	Sun Aug 10 22:07:00 2014 -0300
@@ -381,22 +381,22 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPoint:\n     " + fullName + "\n");
+            sb.append("DistributionPoint:\n     ").append(fullName).append('\n');
         }
         if (relativeName != null) {
-            sb.append("DistributionPoint:\n     " + relativeName + "\n");
+            sb.append("DistributionPoint:\n     ").append(relativeName).append('\n');
         }
 
         if (reasonFlags != null) {
             sb.append("   ReasonFlags:\n");
             for (int i = 0; i < reasonFlags.length; i++) {
                 if (reasonFlags[i]) {
-                    sb.append("    " + reasonToString(i) + "\n");
+                    sb.append("    ").append(reasonToString(i)).append('\n');
                 }
             }
         }
         if (crlIssuer != null) {
-            sb.append("   CRLIssuer:" + crlIssuer + "\n");
+            sb.append("   CRLIssuer:").append(crlIssuer).append('\n');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPointName.java
--- a/src/share/classes/sun/security/x509/DistributionPointName.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPointName.java	Sun Aug 10 22:07:00 2014 -0300
@@ -231,10 +231,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPointName:\n     " + fullName + "\n");
+            sb.append("DistributionPointName:\n     ").append(fullName).append('\n');
 
         } else {
-            sb.append("DistributionPointName:\n     " + relativeName + "\n");
+            sb.append("DistributionPointName:\n     ").append(relativeName).append('\n');
         }
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/PolicyInformation.java
--- a/src/share/classes/sun/security/x509/PolicyInformation.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/PolicyInformation.java	Sun Aug 10 22:07:00 2014 -0300
@@ -259,7 +259,7 @@
      */
     public String toString() {
         StringBuilder s = new StringBuilder("  [" + policyIdentifier.toString());
-        s.append(policyQualifiers + "  ]\n");
+        s.append(policyQualifiers).append("  ]\n");
         return s.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLEntryImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Sun Aug 10 22:07:00 2014 -0300
@@ -292,17 +292,17 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append(serialNumber.toString());
-        sb.append("  On: " + revocationDate.toString());
+        sb.append("  On: ").append(revocationDate.toString());
         if (certIssuer != null) {
-            sb.append("\n    Certificate issuer: " + certIssuer);
+            sb.append("\n    Certificate issuer: ").append(certIssuer);
         }
         if (extensions != null) {
             Collection<Extension> allEntryExts = extensions.getAllExtensions();
             Extension[] exts = allEntryExts.toArray(new Extension[0]);
 
-            sb.append("\n    CRL Entry Extensions: " + exts.length);
+            sb.append("\n    CRL Entry Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n    [" + (i+1) + "]: ");
+                sb.append("\n    [").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -313,9 +313,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLImpl.java	Sun Aug 10 22:07:00 2014 -0300
@@ -537,31 +537,32 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("X.509 CRL v" + (version+1) + "\n");
+        sb.append("X.509 CRL v").append(version + 1).append("\n");
         if (sigAlgId != null)
-            sb.append("Signature Algorithm: " + sigAlgId.toString() +
-                  ", OID=" + (sigAlgId.getOID()).toString() + "\n");
+            sb.append("Signature Algorithm: ").append(sigAlgId.toString())
+                    .append(", OID=")
+                    .append((sigAlgId.getOID()).toString()).append('\n');
         if (issuer != null)
-            sb.append("Issuer: " + issuer.toString() + "\n");
+            sb.append("Issuer: ").append(issuer.toString()).append('\n');
         if (thisUpdate != null)
-            sb.append("\nThis Update: " + thisUpdate.toString() + "\n");
+            sb.append("\nThis Update: ").append(thisUpdate.toString()).append('\n');
         if (nextUpdate != null)
-            sb.append("Next Update: " + nextUpdate.toString() + "\n");
+            sb.append("Next Update: ").append(nextUpdate.toString()).append('\n');
         if (revokedList.isEmpty())
             sb.append("\nNO certificates have been revoked\n");
         else {
-            sb.append("\nRevoked Certificates: " + revokedList.size());
+            sb.append("\nRevoked Certificates: ").append(revokedList.size());
             int i = 1;
             for (X509CRLEntry entry: revokedList) {
-                sb.append("\n[" + i++ + "] " + entry.toString());
+                sb.append("\n[").append(i++).append("] ").append(entry.toString());
             }
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Object[] objs = allExts.toArray();
-            sb.append("\nCRL Extensions: " + objs.length);
+            sb.append("\nCRL Extensions: ").append(objs.length);
             for (int i = 0; i < objs.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = (Extension)objs[i];
                 try {
                    if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -572,9 +573,8 @@
                            out.putOctetString(extValue);
                            extValue = out.toByteArray();
                            HexDumpEncoder enc = new HexDumpEncoder();
-                           sb.append("Extension unknown: "
-                                     + "DER encoded OCTET string =\n"
-                                     + enc.encodeBuffer(extValue) + "\n");
+                           sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                   .append(enc.encodeBuffer(extValue)).append('\n');
                       }
                    } else
                        sb.append(ext.toString()); // sub-class exists
@@ -585,8 +585,7 @@
         }
         if (signature != null) {
             HexDumpEncoder encoder = new HexDumpEncoder();
-            sb.append("\nSignature:\n" + encoder.encodeBuffer(signature)
-                      + "\n");
+            sb.append("\nSignature:\n").append(encoder.encodeBuffer(signature)).append('\n');
         } else
             sb.append("NOT signed yet\n");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertImpl.java
--- a/src/share/classes/sun/security/x509/X509CertImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertImpl.java	Sun Aug 10 22:07:00 2014 -0300
@@ -802,11 +802,11 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append(info.toString() + "\n");
-        sb.append("  Algorithm: [" + algId.toString() + "]\n");
+        sb.append(info.toString()).append('\n');
+        sb.append("  Algorithm: [").append(algId.toString()).append("]\n");
 
         HexDumpEncoder encoder = new HexDumpEncoder();
-        sb.append("  Signature:\n" + encoder.encodeBuffer(signature));
+        sb.append("  Signature:\n").append(encoder.encodeBuffer(signature));
         sb.append("\n]");
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertInfo.java
--- a/src/share/classes/sun/security/x509/X509CertInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertInfo.java	Sun Aug 10 22:07:00 2014 -0300
@@ -298,27 +298,27 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append("  " + version.toString() + "\n");
-        sb.append("  Subject: " + subject.toString() + "\n");
-        sb.append("  Signature Algorithm: " + algId.toString() + "\n");
-        sb.append("  Key:  " + pubKey.toString() + "\n");
-        sb.append("  " + interval.toString() + "\n");
-        sb.append("  Issuer: " + issuer.toString() + "\n");
-        sb.append("  " + serialNum.toString() + "\n");
+        sb.append("  ").append(version.toString()).append('\n');
+        sb.append("  Subject: ").append(subject.toString()).append('\n');
+        sb.append("  Signature Algorithm: ").append(algId.toString()).append('\n');
+        sb.append("  Key:  ").append(pubKey.toString()).append('\n');
+        sb.append("  ").append(interval.toString()).append('\n');
+        sb.append("  Issuer: ").append(issuer.toString()).append('\n');
+        sb.append("  ").append(serialNum.toString()).append('\n');
 
         // optional v2, v3 extras
         if (issuerUniqueId != null) {
-            sb.append("  Issuer Id:\n" + issuerUniqueId.toString() + "\n");
+            sb.append("  Issuer Id:\n").append(issuerUniqueId.toString()).append('\n');
         }
         if (subjectUniqueId != null) {
-            sb.append("  Subject Id:\n" + subjectUniqueId.toString() + "\n");
+            sb.append("  Subject Id:\n").append(subjectUniqueId.toString()).append('\n');
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Extension[] exts = allExts.toArray(new Extension[0]);
-            sb.append("\nCertificate Extensions: " + exts.length);
+            sb.append("\nCertificate Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -329,9 +329,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
@@ -341,10 +340,10 @@
             }
             Map<String,Extension> invalid = extensions.getUnparseableExtensions();
             if (invalid.isEmpty() == false) {
-                sb.append("\nUnparseable certificate extensions: " + invalid.size());
+                sb.append("\nUnparseable certificate extensions: ").append(invalid.size());
                 int i = 1;
                 for (Extension ext : invalid.values()) {
-                    sb.append("\n[" + (i++) + "]: ");
+                    sb.append("\n[").append(i++).append("]: ");
                     sb.append(ext);
                 }
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
--- a/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Sun Aug 10 22:07:00 2014 -0300
@@ -465,10 +465,10 @@
 
     private static void appendIfLiteralAddress(String addr, StringBuffer sb) {
         if (IPAddressUtil.isIPv4LiteralAddress(addr)) {
-            sb.append("dns://" + addr + " ");
+            sb.append("dns://").append(addr).append(' ');
         } else {
             if (IPAddressUtil.isIPv6LiteralAddress(addr)) {
-                sb.append("dns://[" + addr + "] ");
+                sb.append("dns://[").append(addr).append("] ");
             }
         }
     }
diff -r dde9f5cfde5f src/share/classes/sun/net/www/HeaderParser.java
--- a/src/share/classes/sun/net/www/HeaderParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/HeaderParser.java	Sun Aug 10 22:07:00 2014 -0300
@@ -221,16 +221,16 @@
     public String toString () {
         Iterator<String> k = keys();
         StringBuffer sbuf = new StringBuffer();
-        sbuf.append ("{size="+asize+" nkeys="+nkeys+" ");
+        sbuf.append("{size=").append(asize).append(" nkeys=").append(nkeys).append(' ');
         for (int i=0; k.hasNext(); i++) {
             String key = k.next();
             String val = findValue (i);
             if (val != null && "".equals (val)) {
                 val = null;
             }
-            sbuf.append (" {"+key+(val==null?"":","+val)+"}");
+            sbuf.append(" {").append(key).append(val == null ? "" : "," + val).append('}');
             if (k.hasNext()) {
-                sbuf.append (",");
+                sbuf.append (',');
             }
         }
         sbuf.append (" }");
diff -r dde9f5cfde5f src/share/classes/sun/net/www/MimeEntry.java
--- a/src/share/classes/sun/net/www/MimeEntry.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/MimeEntry.java	Sun Aug 10 22:07:00 2014 -0300
@@ -288,7 +288,7 @@
 
         int action = getAction();
         if (action != MimeEntry.UNKNOWN) {
-            sb.append("action=" + actionKeywords[action]);
+            sb.append("action=").append(actionKeywords[action]);
             needSeparator = true;
         }
 
@@ -297,7 +297,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("application=" + command);
+            sb.append("application=").append(command);
             needSeparator = true;
         }
 
@@ -305,7 +305,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("icon=" + getImageFileName());
+            sb.append("icon=").append(getImageFileName());
             needSeparator = true;
         }
 
@@ -314,7 +314,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("file_extensions=" + extensions);
+            sb.append("file_extensions=").append(extensions);
             needSeparator = true;
         }
 
@@ -323,7 +323,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("description=" + description);
+            sb.append("description=").append(description);
         }
 
         return sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/management/Agent.java
--- a/src/share/classes/sun/management/Agent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/Agent.java	Sun Aug 10 22:07:00 2014 -0300
@@ -502,7 +502,7 @@
         } else {
             StringBuilder message = new StringBuilder(params[0]);
             for (int i = 1; i < params.length; i++) {
-                message.append(" " + params[i]);
+                message.append(' ').append(params[i]);
             }
             error(key, message.toString());
         }
diff -r dde9f5cfde5f src/share/classes/sun/management/MappedMXBeanType.java
--- a/src/share/classes/sun/management/MappedMXBeanType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/MappedMXBeanType.java	Sun Aug 10 22:07:00 2014 -0300
@@ -289,7 +289,7 @@
             if (et.isPrimitive()) {
                 className = new StringBuilder(c.getName());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
@@ -385,7 +385,7 @@
             if (elementType instanceof Class && ((Class) elementType).isPrimitive()) {
                 className = new StringBuilder(gat.toString());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/launcher/LauncherHelper.java
--- a/src/share/classes/sun/launcher/LauncherHelper.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/launcher/LauncherHelper.java	Sun Aug 10 22:07:00 2014 -0300
@@ -370,8 +370,7 @@
         outBuf = outBuf.append(getLocalizedMessage("java.launcher.ergo.message1",
                 vm));
         outBuf = (isServerClass)
-             ? outBuf.append(",\n" +
-                getLocalizedMessage("java.launcher.ergo.message2") + "\n\n")
+             ? outBuf.append(",\n").append(getLocalizedMessage("java.launcher.ergo.message2")).append("\n\n")
              : outBuf.append(".\n\n");
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/font/AttributeValues.java
--- a/src/share/classes/sun/font/AttributeValues.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/AttributeValues.java	Sun Aug 10 22:06:59 2014 -0300
@@ -542,7 +542,7 @@
                 }
             }
         }
-        b.append("[btx=" + baselineTransform + ", ctx=" + charTransform + "]");
+        b.append("[btx=").append(baselineTransform).append(", ctx=").append(charTransform).append(']');
         b.append('}');
         return b.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/font/Decoration.java
--- a/src/share/classes/sun/font/Decoration.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/Decoration.java	Sun Aug 10 22:06:59 2014 -0300
@@ -431,12 +431,12 @@
             StringBuilder sb = new StringBuilder();
             sb.append(super.toString());
             sb.append("[");
-            if (fgPaint != null) sb.append("fgPaint: " + fgPaint);
-            if (bgPaint != null) sb.append(" bgPaint: " + bgPaint);
+            if (fgPaint != null) sb.append("fgPaint: ").append(fgPaint);
+            if (bgPaint != null) sb.append(" bgPaint: ").append(bgPaint);
             if (swapColors) sb.append(" swapColors: true");
             if (strikethrough) sb.append(" strikethrough: true");
-            if (stdUnderline != null) sb.append(" stdUnderline: " + stdUnderline);
-            if (imUnderline != null) sb.append(" imUnderline: " + imUnderline);
+            if (stdUnderline != null) sb.append(" stdUnderline: ").append(stdUnderline);
+            if (imUnderline != null) sb.append(" imUnderline: ").append(imUnderline);
             sb.append("]");
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/font/StandardGlyphVector.java
--- a/src/share/classes/sun/font/StandardGlyphVector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/StandardGlyphVector.java	Sun Aug 10 22:06:59 2014 -0300
@@ -1894,9 +1894,9 @@
             }
         }
         catch(Exception e) {
-            buf.append(" " + e.getMessage());
+            buf.append(' ').append(e.getMessage());
         }
-        buf.append("}");
+        buf.append('}');
 
         return buf;
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/swing/GroupLayout.java
--- a/src/share/classes/javax/swing/GroupLayout.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/GroupLayout.java	Sun Aug 10 22:06:59 2014 -0300
@@ -1239,15 +1239,12 @@
             padding = ", userCreated=" + paddingSpring.getUserCreated() +
                     ", matches=" + paddingSpring.getMatchDescription();
         }
-        buffer.append(indent + spring.getClass().getName() + " " +
-                Integer.toHexString(spring.hashCode()) + " " +
-                origin +
-                ", size=" + spring.getSize() +
-                ", alignment=" + spring.getAlignment() +
-                " prefs=[" + spring.getMinimumSize(axis) +
-                " " + spring.getPreferredSize(axis) +
-                " " + spring.getMaximumSize(axis) +
-                padding + "]\n");
+        buffer.append(indent).append(spring.getClass().getName())
+                .append(' ').append(Integer.toHexString(spring.hashCode())).append(' ')
+                .append(origin).append(", size=").append(spring.getSize()).append(", alignment=")
+                .append(spring.getAlignment()).append(" prefs=[").append(spring.getMinimumSize(axis)).append(' ')
+                .append(spring.getPreferredSize(axis)).append(' ').append(spring.getMaximumSize(axis))
+                .append(padding).append("]\n");
         if (spring instanceof Group) {
             List<Spring> springs = ((Group)spring).springs;
             indent += "  ";
diff -r dde9f5cfde5f src/share/classes/javax/swing/JColorChooser.java
--- a/src/share/classes/javax/swing/JColorChooser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/JColorChooser.java	Sun Aug 10 22:06:59 2014 -0300
@@ -545,8 +545,7 @@
     protected String paramString() {
         StringBuilder chooserPanelsString = new StringBuilder("");
         for (int i=0; i<chooserPanels.length; i++) {
-            chooserPanelsString.append("[" + chooserPanels[i].toString()
-                                       + "]");
+            chooserPanelsString.append('[').append(chooserPanels[i].toString()).append(']');
         }
         String previewPanelString = (previewPanel != null ?
                                      previewPanel.toString() : "");
diff -r dde9f5cfde5f src/share/classes/javax/swing/MultiUIDefaults.java
--- a/src/share/classes/javax/swing/MultiUIDefaults.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/MultiUIDefaults.java	Sun Aug 10 22:06:59 2014 -0300
@@ -195,13 +195,13 @@
         Enumeration<?> keys = keys();
         while (keys.hasMoreElements()) {
             Object key = keys.nextElement();
-            sb.append(key + "=" + get(key) + ", ");
+            sb.append(key).append('=').append(get(key)).append(", ");
         }
         int length = sb.length();
         if (length > 1) {
             sb.delete(length-2, length);
         }
-        sb.append("}");
+        sb.append('}');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/javax/swing/RepaintManager.java
--- a/src/share/classes/javax/swing/RepaintManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/RepaintManager.java	Sun Aug 10 22:06:59 2014 -0300
@@ -992,7 +992,7 @@
     public synchronized String toString() {
         StringBuilder sb = new StringBuilder();
         if(dirtyComponents != null)
-            sb.append("" + dirtyComponents);
+            sb.append(dirtyComponents);
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/event/TreeModelEvent.java
--- a/src/share/classes/javax/swing/event/TreeModelEvent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/event/TreeModelEvent.java	Sun Aug 10 22:06:59 2014 -0300
@@ -294,21 +294,20 @@
     public String toString() {
         StringBuilder   sb = new StringBuilder();
 
-        sb.append(getClass().getName() + " " +
-                  Integer.toString(hashCode()));
+        sb.append(getClass().getName()).append(" ").append(Integer.toString(hashCode()));
         if(path != null)
-            sb.append(" path " + path);
+            sb.append(" path ").append(path);
         if(childIndices != null) {
             sb.append(" indices [ ");
             for(int counter = 0; counter < childIndices.length; counter++)
-                sb.append(Integer.toString(childIndices[counter])+ " ");
-            sb.append("]");
+                sb.append(Integer.toString(childIndices[counter])).append(' ');
+            sb.append(']');
         }
         if(children != null) {
             sb.append(" children [ ");
             for(int counter = 0; counter < children.length; counter++)
-                sb.append(children[counter] + " ");
-            sb.append("]");
+                sb.append(children[counter]).append(' ');
+            sb.append(']');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Sun Aug 10 22:06:59 2014 -0300
@@ -1330,8 +1330,8 @@
 
             for (Object obj : values) {
                 String val = ((obj == null) ? "" : obj.toString());
-                plainBuf.append(val + "\n");
-                htmlBuf.append("  <li>" + val + "\n");
+                plainBuf.append(val).append('\n');
+                htmlBuf.append("  <li>").append(val).append('\n');
             }
 
             // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicListUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Sun Aug 10 22:06:59 2014 -0300
@@ -2948,8 +2948,8 @@
                 for (int i = 0; i < values.length; i++) {
                     Object obj = values[i];
                     String val = ((obj == null) ? "" : obj.toString());
-                    plainStr.append(val + "\n");
-                    htmlStr.append("  <li>" + val + "\n");
+                    plainStr.append(val).append('\n');
+                    htmlStr.append("  <li>").append(val).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTableUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Sun Aug 10 22:06:59 2014 -0300
@@ -2230,11 +2230,11 @@
                     for (int col = 0; col < cols.length; col++) {
                         Object obj = table.getValueAt(rows[row], cols[col]);
                         String val = ((obj == null) ? "" : obj.toString());
-                        plainStr.append(val + "\t");
-                        htmlStr.append("  <td>" + val + "</td>\n");
+                        plainStr.append(val).append('\t');
+                        htmlStr.append("  <td>").append(val).append("</td>\n");
                     }
                     // we want a newline at the end of each line and not a tab
-                    plainStr.deleteCharAt(plainStr.length() - 1).append("\n");
+                    plainStr.deleteCharAt(plainStr.length() - 1).append('\t');
                     htmlStr.append("</tr>\n");
                 }
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Sun Aug 10 22:06:59 2014 -0300
@@ -3618,8 +3618,8 @@
                     boolean leaf = model.isLeaf(node);
                     String label = getDisplayString(path, true, leaf);
 
-                    plainStr.append(label + "\n");
-                    htmlStr.append("  <li>" + label + "\n");
+                    plainStr.append(label).append('\n');
+                    htmlStr.append("  <li>").append(label).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
--- a/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Sun Aug 10 22:06:59 2014 -0300
@@ -1160,15 +1160,15 @@
             rows = rowMapper.getRowsForPaths(selection);
         else
             rows = null;
-        sb.append(getClass().getName() + " " + hashCode() + " [ ");
+        sb.append(getClass().getName()).append(' ').append(hashCode()).append(" [ ");
         for(int counter = 0; counter < selCount; counter++) {
             if(rows != null)
-                sb.append(selection[counter].toString() + "@" +
-                          Integer.toString(rows[counter])+ " ");
+                sb.append(selection[counter].toString()).append('@')
+                        .append(Integer.toString(rows[counter])).append(' ');
             else
-                sb.append(selection[counter].toString() + " ");
+                sb.append(selection[counter].toString()).append(' ');
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/AudioFileFormat.java
--- a/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Sun Aug 10 22:06:59 2014 -0300
@@ -276,19 +276,19 @@
 
         //$$fb2002-11-01: fix for 4672864: AudioFileFormat.toString() throws unexpected NullPointerException
         if (type != null) {
-            buf.append(type.toString() + " (." + type.getExtension() + ") file");
+            buf.append(type.toString()).append(" (.").append(type.getExtension()).append(") file");
         } else {
             buf.append("unknown file format");
         }
 
         if (byteLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", byte length: " + byteLength);
+            buf.append(", byte length: ").append(byteLength);
         }
 
-        buf.append(", data format: " + format);
+        buf.append(", data format: ").append(format);
 
         if (frameLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", frame length: " + frameLength);
+            buf.append(", frame length: ").append(frameLength);
         }
 
         return new String(buf);
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/DataLine.java
--- a/src/share/classes/javax/sound/sampled/DataLine.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/DataLine.java	Sun Aug 10 22:06:59 2014 -0300
@@ -473,17 +473,17 @@
             StringBuilder sb = new StringBuilder();
 
             if ( (formats.length == 1) && (formats[0] != null) ) {
-                sb.append(" supporting format " + formats[0]);
+                sb.append(" supporting format ").append(formats[0]);
             } else if (getFormats().length > 1) {
-                sb.append(" supporting " + getFormats().length + " audio formats");
+                sb.append(" supporting ").append(getFormats().length).append(" audio formats");
             }
 
             if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (maxBufferSize != AudioSystem.NOT_SPECIFIED) ) {
-                sb.append(", and buffers of " + minBufferSize + " to " + maxBufferSize + " bytes");
+                sb.append(", and buffers of ").append(minBufferSize).append(" to ").append(maxBufferSize).append(" bytes");
             } else if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (minBufferSize > 0) ) {
-                sb.append(", and buffers of at least " + minBufferSize + " bytes");
+                sb.append(", and buffers of at least ").append(minBufferSize).append(" bytes");
             } else if (maxBufferSize != AudioSystem.NOT_SPECIFIED) {
-                sb.append(", and buffers of up to " + minBufferSize + " bytes");
+                sb.append(", and buffers of up to ").append(minBufferSize).append(" bytes");
             }
 
             return new String(super.toString() + sb);
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
--- a/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Sun Aug 10 22:06:59 2014 -0300
@@ -651,8 +651,7 @@
         StringBuilder caddrString = new StringBuilder();
         if (clientAddresses != null) {
             for (int i = 0; i < clientAddresses.length; i++) {
-                caddrString.append("clientAddresses[" + i + "] = " +
-                        clientAddresses[i].toString());
+                caddrString.append("clientAddresses[").append(i).append("] = ").append(clientAddresses[i].toString());
             }
         }
         return ("Ticket (hex) = " + "\n" +
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/naming/BinaryRefAddr.java
--- a/src/share/classes/javax/naming/BinaryRefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/BinaryRefAddr.java	Sun Aug 10 22:06:59 2014 -0300
@@ -165,11 +165,11 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Address Type: " + addrType + "\n");
-
+        StringBuilder str = new StringBuilder();
+        str.append("Address Type: ").append(addrType).append('\n');
         str.append("AddressContents: ");
         for (int i = 0; i<buf.length && i < 32; i++) {
-            str.append(Integer.toHexString(buf[i]) +" ");
+            str.append(Integer.toHexString(buf[i])).append(' ');
         }
         if (buf.length >= 32)
             str.append(" ...\n");
diff -r dde9f5cfde5f src/share/classes/javax/naming/NameImpl.java
--- a/src/share/classes/javax/naming/NameImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/NameImpl.java	Sun Aug 10 22:06:59 2014 -0300
@@ -170,7 +170,7 @@
                 endQuote = one ? syntaxEndQuote1 : syntaxEndQuote2;
 
                 i += syntaxTypevalSeparator.length();
-                answer.append(syntaxTypevalSeparator+beginQuote); // add back
+                answer.append(syntaxTypevalSeparator).append(beginQuote); // add back
 
                 // consume string until matching quote
                 for (i += beginQuote.length();
diff -r dde9f5cfde5f src/share/classes/javax/naming/RefAddr.java
--- a/src/share/classes/javax/naming/RefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/RefAddr.java	Sun Aug 10 22:06:59 2014 -0300
@@ -139,9 +139,9 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Type: " + addrType + "\n");
-
-        str.append("Content: " + getContent() + "\n");
+        StringBuilder str = new StringBuilder();
+        str.append("Type: ").append(addrType).append('\n');
+        str.append("Content: ").append(getContent()).append('\n');
         return (str.toString());
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/crypto/CryptoPermission.java
--- a/src/share/classes/javax/crypto/CryptoPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/crypto/CryptoPermission.java	Sun Aug 10 22:06:59 2014 -0300
@@ -370,20 +370,18 @@
      */
     public String toString() {
         StringBuilder buf = new StringBuilder(100);
-        buf.append("(CryptoPermission " + alg + " " + maxKeySize);
+        buf.append("(CryptoPermission ").append(alg).append(' ').append(maxKeySize);
         if (algParamSpec != null) {
             if (algParamSpec instanceof RC2ParameterSpec) {
-                buf.append(" , effective " +
-                    ((RC2ParameterSpec)algParamSpec).getEffectiveKeyBits());
+                buf.append(" , effective ").append(((RC2ParameterSpec) algParamSpec).getEffectiveKeyBits());
             } else if (algParamSpec instanceof RC5ParameterSpec) {
-                buf.append(" , rounds " +
-                    ((RC5ParameterSpec)algParamSpec).getRounds());
+                buf.append(" , rounds ").append(((RC5ParameterSpec) algParamSpec).getRounds());
             }
         }
         if (exemptionMechanism != null) { // OPTIONAL
-            buf.append(" " + exemptionMechanism);
+            buf.append(' ').append(exemptionMechanism);
         }
-        buf.append(")");
+        buf.append(')');
         return buf.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/management/MBeanPermission.java
--- a/src/share/classes/javax/management/MBeanPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/MBeanPermission.java	Sun Aug 10 22:06:59 2014 -0300
@@ -455,11 +455,11 @@
         name.append(className);
         if (member == null)
             member = "-";
-        name.append("#" + member);
+        name.append('#').append(member);
         if (objectName == null)
             name.append("[-]");
         else
-            name.append("[").append(objectName.getCanonicalName()).append("]");
+            name.append('[').append(objectName.getCanonicalName()).append(']');
 
         /* In the interests of legibility for Permission.toString(), we
            transform the empty string into "*".  */
diff -r dde9f5cfde5f src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
--- a/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Sun Aug 10 22:06:59 2014 -0300
@@ -716,15 +716,14 @@
         }
 
         retStr.append("\nMBeanInfo for ModelMBean is:");
-        retStr.append("\nCLASSNAME: \t"+ info.getClassName());
-        retStr.append("\nDESCRIPTION: \t"+ info.getDescription());
+        retStr.append("\nCLASSNAME: \t").append(info.getClassName());
+        retStr.append("\nDESCRIPTION: \t").append(info.getDescription());
 
 
         try {
-            retStr.append("\nMBEAN DESCRIPTOR: \t"+
-                          info.getMBeanDescriptor());
+            retStr.append("\nMBEAN DESCRIPTOR: \t").append(info.getMBeanDescriptor());
         } catch (Exception e) {
-            retStr.append("\nMBEAN DESCRIPTOR: \t" + " is invalid");
+            retStr.append("\nMBEAN DESCRIPTOR: \t  is invalid");
         }
 
         retStr.append("\nATTRIBUTES");
@@ -734,13 +733,12 @@
             for (int i=0; i<attrInfo.length; i++) {
                 final ModelMBeanAttributeInfo attInfo =
                     (ModelMBeanAttributeInfo)attrInfo[i];
-                retStr.append(" ** NAME: \t"+ attInfo.getName());
-                retStr.append("    DESCR: \t"+ attInfo.getDescription());
-                retStr.append("    TYPE: \t"+ attInfo.getType() +
-                              "    READ: \t"+ attInfo.isReadable() +
-                              "    WRITE: \t"+ attInfo.isWritable());
-                retStr.append("    DESCRIPTOR: " +
-                              attInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(attInfo.getName());
+                retStr.append("    DESCR: \t").append(attInfo.getDescription());
+                retStr.append("    TYPE: \t").append(attInfo.getType())
+                        .append("    READ: \t").append(attInfo.isReadable())
+                        .append("    WRITE: \t").append(attInfo.isWritable());
+                retStr.append("    DESCRIPTOR: ").append(attInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No attributes **");
@@ -752,14 +750,12 @@
             for (int i=0; i<constrInfo.length; i++) {
                 final ModelMBeanConstructorInfo ctorInfo =
                     (ModelMBeanConstructorInfo)constrInfo[i];
-                retStr.append(" ** NAME: \t"+ ctorInfo.getName());
-                retStr.append("    DESCR: \t"+
-                              ctorInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              ctorInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              ctorInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(ctorInfo.getName());
+                retStr.append("    DESCR: \t").append(ctorInfo.getDescription());
+                retStr.append("    PARAM: \t").append(ctorInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ")
+                        .append(ctorInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No Constructors **");
@@ -771,13 +767,11 @@
             for (int i=0; i<opsInfo.length; i++) {
                 final ModelMBeanOperationInfo operInfo =
                     (ModelMBeanOperationInfo)opsInfo[i];
-                retStr.append(" ** NAME: \t"+ operInfo.getName());
-                retStr.append("    DESCR: \t"+ operInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              operInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              operInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(operInfo.getName());
+                retStr.append("    DESCR: \t").append(operInfo.getDescription());
+                retStr.append("    PARAM: \t").append(operInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ").append(operInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No operations ** ");
@@ -790,10 +784,9 @@
             for (int i=0; i<notifInfo.length; i++) {
                 final ModelMBeanNotificationInfo nInfo =
                     (ModelMBeanNotificationInfo)notifInfo[i];
-                retStr.append(" ** NAME: \t"+ nInfo.getName());
-                retStr.append("    DESCR: \t"+ nInfo.getDescription());
-                retStr.append("    DESCRIPTOR: " +
-                              nInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(nInfo.getName());
+                retStr.append("    DESCR: \t").append(nInfo.getDescription());
+                retStr.append("    DESCRIPTOR: ").append(nInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No notifications **");
diff -r dde9f5cfde5f src/share/classes/javax/management/openmbean/CompositeType.java
--- a/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/openmbean/CompositeType.java	Sun Aug 10 22:06:59 2014 -0300
@@ -45,6 +45,7 @@
  *
  * @since 1.5
  */
+ at SuppressWarnings("StringConcatenationInsideStringBufferAppend")
 public class CompositeType extends OpenType<CompositeData> {
 
     /* Serial version */
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/Role.java
--- a/src/share/classes/javax/management/relation/Role.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/Role.java	Sun Aug 10 22:06:59 2014 -0300
@@ -227,7 +227,7 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role name: " + name + "; role value: ");
+        result.append("role name: ").append(name).append("; role value: ");
         for (Iterator<ObjectName> objNameIter = objectNameList.iterator();
              objNameIter.hasNext();) {
             ObjectName currObjName = objNameIter.next();
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleInfo.java
--- a/src/share/classes/javax/management/relation/RoleInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleInfo.java	Sun Aug 10 22:06:59 2014 -0300
@@ -456,13 +456,13 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role info name: " + name);
-        result.append("; isReadable: " + isReadable);
-        result.append("; isWritable: " + isWritable);
-        result.append("; description: " + description);
-        result.append("; minimum degree: " + minDegree);
-        result.append("; maximum degree: " + maxDegree);
-        result.append("; MBean class: " + referencedMBeanClassName);
+        result.append("role info name: ").append(name);
+        result.append("; isReadable: ").append(isReadable);
+        result.append("; isWritable: ").append(isWritable);
+        result.append("; description: ").append(description);
+        result.append("; minimum degree: ").append(minDegree);
+        result.append("; maximum degree: ").append(maxDegree);
+        result.append("; MBean class: ").append(referencedMBeanClassName);
         return result.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleUnresolved.java
--- a/src/share/classes/javax/management/relation/RoleUnresolved.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleUnresolved.java	Sun Aug 10 22:06:59 2014 -0300
@@ -282,7 +282,7 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role name: " + roleName);
+        result.append("role name: ").append(roleName);
         if (roleValue != null) {
             result.append("; value: ");
             for (Iterator<ObjectName> objNameIter = roleValue.iterator();
@@ -294,7 +294,7 @@
                 }
             }
         }
-        result.append("; problem type: " + problemType);
+        result.append("; problem type: ").append(problemType);
         return result.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/util/Scanner.java
--- a/src/share/classes/java/util/Scanner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/Scanner.java	Sun Aug 10 22:06:59 2014 -0300
@@ -1304,20 +1304,20 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.Scanner");
-        sb.append("[delimiters=" + delimPattern + "]");
-        sb.append("[position=" + position + "]");
-        sb.append("[match valid=" + matchValid + "]");
-        sb.append("[need input=" + needInput + "]");
-        sb.append("[source closed=" + sourceClosed + "]");
-        sb.append("[skipped=" + skipped + "]");
-        sb.append("[group separator=" + groupSeparator + "]");
-        sb.append("[decimal separator=" + decimalSeparator + "]");
-        sb.append("[positive prefix=" + positivePrefix + "]");
-        sb.append("[negative prefix=" + negativePrefix + "]");
-        sb.append("[positive suffix=" + positiveSuffix + "]");
-        sb.append("[negative suffix=" + negativeSuffix + "]");
-        sb.append("[NaN string=" + nanString + "]");
-        sb.append("[infinity string=" + infinityString + "]");
+        sb.append("[delimiters=").append(delimPattern).append(']');
+        sb.append("[position=").append(position).append(']');
+        sb.append("[match valid=").append(matchValid).append(']');
+        sb.append("[need input=").append(needInput).append(']');
+        sb.append("[source closed=").append(sourceClosed).append(']');
+        sb.append("[skipped=").append(skipped).append(']');
+        sb.append("[group separator=").append(groupSeparator).append(']');
+        sb.append("[decimal separator=").append(decimalSeparator).append(']');
+        sb.append("[positive prefix=").append(positivePrefix).append(']');
+        sb.append("[negative prefix=").append(negativePrefix).append(']');
+        sb.append("[positive suffix=").append(positiveSuffix).append(']');
+        sb.append("[negative suffix=").append(negativeSuffix).append(']');
+        sb.append("[NaN string=").append(nanString).append(']');
+        sb.append("[infinity string=").append(infinityString).append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Matcher.java
--- a/src/share/classes/java/util/regex/Matcher.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Matcher.java	Sun Aug 10 22:06:59 2014 -0300
@@ -1295,14 +1295,14 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.regex.Matcher");
-        sb.append("[pattern=" + pattern());
+        sb.append("[pattern=").append(pattern());
         sb.append(" region=");
-        sb.append(regionStart() + "," + regionEnd());
+        sb.append(regionStart()).append(',').append(regionEnd());
         sb.append(" lastmatch=");
         if ((first >= 0) && (group() != null)) {
             sb.append(group());
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Pattern.java
--- a/src/share/classes/java/util/regex/Pattern.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Pattern.java	Sun Aug 10 22:06:59 2014 -0300
@@ -1488,10 +1488,10 @@
         for(int x=0; x<perms.length; x++) {
             String next = base + perms[x];
             if (x>0)
-                result.append("|"+next);
+                result.append('|').append(next);
             next = composeOneStep(next);
             if (next != null)
-                result.append("|"+produceEquivalentAlternation(next));
+                result.append('|').append(produceEquivalentAlternation(next));
         }
         return result.toString();
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/text/ChoiceFormat.java
--- a/src/share/classes/java/text/ChoiceFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/text/ChoiceFormat.java	Sun Aug 10 22:06:58 2014 -0300
@@ -272,7 +272,7 @@
             double tryLess = Math.abs(Math.IEEEremainder(less, 1.0d));
 
             if (tryLessOrEqual < tryLess) {
-                result.append(""+choiceLimits[i]);
+                result.append(choiceLimits[i]);
                 result.append('#');
             } else {
                 if (choiceLimits[i] == Double.POSITIVE_INFINITY) {
@@ -280,7 +280,7 @@
                 } else if (choiceLimits[i] == Double.NEGATIVE_INFINITY) {
                     result.append("-\u221E");
                 } else {
-                    result.append(""+less);
+                    result.append(less);
                 }
                 result.append('<');
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSigner.java
--- a/src/share/classes/java/security/CodeSigner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSigner.java	Sun Aug 10 22:06:58 2014 -0300
@@ -156,9 +156,9 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("Signer: " + signerCertPath.getCertificates().get(0));
+        sb.append("Signer: ").append(signerCertPath.getCertificates().get(0));
         if (timestamp != null) {
-            sb.append("timestamp: " + timestamp);
+            sb.append("timestamp: ").append(timestamp);
         }
         sb.append(")");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSource.java
--- a/src/share/classes/java/security/CodeSource.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSource.java	Sun Aug 10 22:06:58 2014 -0300
@@ -468,12 +468,12 @@
 
         if (this.certs != null && this.certs.length > 0) {
             for (int i = 0; i < this.certs.length; i++) {
-                sb.append( " " + this.certs[i]);
+                sb.append(' ').append(this.certs[i]);
             }
 
         } else if (this.signers != null && this.signers.length > 0) {
             for (int i = 0; i < this.signers.length; i++) {
-                sb.append( " " + this.signers[i]);
+                sb.append(' ').append(this.signers[i]);
             }
         } else {
             sb.append(" <no signer certificates>");
diff -r dde9f5cfde5f src/share/classes/java/security/KeyStore.java
--- a/src/share/classes/java/security/KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/KeyStore.java	Sun Aug 10 22:06:58 2014 -0300
@@ -610,8 +610,7 @@
          */
         public String toString() {
             StringBuilder sb = new StringBuilder();
-            sb.append("Private key entry and certificate chain with "
-                + chain.length + " elements:\r\n");
+            sb.append("Private key entry and certificate chain with ").append(chain.length).append(" elements:\r\n");
             for (Certificate cert : chain) {
                 sb.append(cert);
                 sb.append("\r\n");
diff -r dde9f5cfde5f src/share/classes/java/security/PermissionCollection.java
--- a/src/share/classes/java/security/PermissionCollection.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/PermissionCollection.java	Sun Aug 10 22:06:58 2014 -0300
@@ -179,12 +179,12 @@
     public String toString() {
         Enumeration<Permission> enum_ = elements();
         StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()+" (\n");
+        sb.append(super.toString()).append(" (\n");
         while (enum_.hasMoreElements()) {
             try {
-                sb.append(" ");
+                sb.append(' ');
                 sb.append(enum_.nextElement().toString());
-                sb.append("\n");
+                sb.append('\n');
             } catch (NoSuchElementException e){
                 // ignore
             }
diff -r dde9f5cfde5f src/share/classes/java/security/ProtectionDomain.java
--- a/src/share/classes/java/security/ProtectionDomain.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/ProtectionDomain.java	Sun Aug 10 22:06:58 2014 -0300
@@ -291,9 +291,9 @@
             StringBuilder palBuf = new StringBuilder("(principals ");
 
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                            " \"" + principals[i].getName() +
-                            "\"");
+                palBuf.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append('\"');
                 if (i < principals.length-1)
                     palBuf.append(",\n");
                 else
diff -r dde9f5cfde5f src/share/classes/java/security/Timestamp.java
--- a/src/share/classes/java/security/Timestamp.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/Timestamp.java	Sun Aug 10 22:06:58 2014 -0300
@@ -143,10 +143,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("timestamp: " + timestamp);
+        sb.append("timestamp: ").append(timestamp);
         List<? extends Certificate> certs = signerCertPath.getCertificates();
         if (!certs.isEmpty()) {
-            sb.append("TSA: " + certs.get(0));
+            sb.append("TSA: ").append(certs.get(0));
         } else {
             sb.append("TSA: <empty>");
         }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CertPath.java
--- a/src/share/classes/java/security/cert/CertPath.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CertPath.java	Sun Aug 10 22:06:58 2014 -0300
@@ -224,17 +224,16 @@
         Iterator<? extends Certificate> stringIterator =
                                         getCertificates().iterator();
 
-        sb.append("\n" + type + " Cert Path: length = "
-            + getCertificates().size() + ".\n");
+        sb.append("\n").append(type).append(" Cert Path: length = ").append(getCertificates().size()).append(".\n");
         sb.append("[\n");
         int i = 1;
         while (stringIterator.hasNext()) {
-            sb.append("=========================================="
-                + "===============Certificate " + i + " start.\n");
+            sb.append("==========================================" + "===============Certificate ")
+                    .append(i).append(" start.\n");
             Certificate stringCert = stringIterator.next();
             sb.append(stringCert.toString());
-            sb.append("\n========================================"
-                + "=================Certificate " + i + " end.\n\n\n");
+            sb.append("\n========================================" + "=================Certificate ")
+                    .append(i).append(" end.\n\n\n");
             i++;
         }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CollectionCertStoreParameters.java
--- a/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Sun Aug 10 22:06:58 2014 -0300
@@ -134,8 +134,8 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CollectionCertStoreParameters: [\n");
-        sb.append("  collection: " + coll + "\n");
-        sb.append("]");
+        sb.append("  collection: ").append(coll).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/LDAPCertStoreParameters.java
--- a/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Sun Aug 10 22:06:58 2014 -0300
@@ -141,9 +141,9 @@
         StringBuilder sb = new StringBuilder();
         sb.append("LDAPCertStoreParameters: [\n");
 
-        sb.append("  serverName: " + serverName + "\n");
-        sb.append("  port: " + port + "\n");
-        sb.append("]");
+        sb.append("  serverName: ").append(serverName).append("\n");
+        sb.append("  port: ").append(port).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXBuilderParameters.java
--- a/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Sun Aug 10 22:06:58 2014 -0300
@@ -192,7 +192,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Maximum Path Length: " + maxPathLength + "\n");
+        sb.append("  Maximum Path Length: ").append(maxPathLength).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Sun Aug 10 22:06:58 2014 -0300
@@ -109,11 +109,11 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathBuilderResult: [\n");
-        sb.append("  Certification Path: " + certPath + "\n");
-        sb.append("  Trust Anchor: " + getTrustAnchor().toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(getPolicyTree()) + "\n");
-        sb.append("  Subject Public Key: " + getPublicKey() + "\n");
-        sb.append("]");
+        sb.append("  Certification Path: ").append(certPath).append('\n');
+        sb.append("  Trust Anchor: ").append(getTrustAnchor().toString()).append('\n');
+        sb.append("  Policy Tree: ").append(String.valueOf(getPolicyTree())).append('\n');
+        sb.append("  Subject Public Key: ").append(getPublicKey()).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Sun Aug 10 22:06:58 2014 -0300
@@ -150,10 +150,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathValidatorResult: [\n");
-        sb.append("  Trust Anchor: " + trustAnchor.toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(policyTree) + "\n");
-        sb.append("  Subject Public Key: " + subjectPublicKey + "\n");
-        sb.append("]");
+        sb.append("  Trust Anchor: ").append(trustAnchor.toString()).append('\n');
+        sb.append("  Policy Tree: ").append(String.valueOf(policyTree)).append('\n');
+        sb.append("  Subject Public Key: ").append(subjectPublicKey).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXParameters.java
--- a/src/share/classes/java/security/cert/PKIXParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXParameters.java	Sun Aug 10 22:06:58 2014 -0300
@@ -698,8 +698,7 @@
 
         /* start with trusted anchor info */
         if (unmodTrustAnchors != null) {
-            sb.append("  Trust Anchors: " + unmodTrustAnchors.toString()
-                + "\n");
+            sb.append("  Trust Anchors: ").append(unmodTrustAnchors.toString()).append('\n');
         }
 
         /* now, append initial state information */
@@ -707,30 +706,28 @@
             if (unmodInitialPolicies.isEmpty()) {
                 sb.append("  Initial Policy OIDs: any\n");
             } else {
-                sb.append("  Initial Policy OIDs: ["
-                    + unmodInitialPolicies.toString() + "]\n");
+                sb.append("  Initial Policy OIDs: [").append(unmodInitialPolicies.toString()).append("]\n");
             }
         }
 
         /* now, append constraints on all certificates in the path */
-        sb.append("  Validity Date: " + String.valueOf(date) + "\n");
-        sb.append("  Signature Provider: " + String.valueOf(sigProvider) + "\n");
-        sb.append("  Default Revocation Enabled: " + revocationEnabled + "\n");
-        sb.append("  Explicit Policy Required: " + explicitPolicyRequired + "\n");
-        sb.append("  Policy Mapping Inhibited: " + policyMappingInhibited + "\n");
-        sb.append("  Any Policy Inhibited: " + anyPolicyInhibited + "\n");
-        sb.append("  Policy Qualifiers Rejected: " + policyQualifiersRejected + "\n");
+        sb.append("  Validity Date: ").append(String.valueOf(date)).append('\n');
+        sb.append("  Signature Provider: ").append(String.valueOf(sigProvider)).append('\n');
+        sb.append("  Default Revocation Enabled: ").append(revocationEnabled).append('\n');
+        sb.append("  Explicit Policy Required: ").append(explicitPolicyRequired).append('\n');
+        sb.append("  Policy Mapping Inhibited: ").append(policyMappingInhibited).append('\n');
+        sb.append("  Any Policy Inhibited: ").append(anyPolicyInhibited).append('\n');
+        sb.append("  Policy Qualifiers Rejected: ").append(policyQualifiersRejected).append('\n');
 
         /* now, append target cert requirements */
-        sb.append("  Target Cert Constraints: " + String.valueOf(certSelector) + "\n");
+        sb.append("  Target Cert Constraints: ").append(String.valueOf(certSelector)).append('\n');
 
         /* finally, append miscellaneous parameters */
         if (certPathCheckers != null)
-            sb.append("  Certification Path Checkers: ["
-                + certPathCheckers.toString() + "]\n");
+            sb.append("  Certification Path Checkers: [").append(certPathCheckers.toString()).append("]\n");
         if (certStores != null)
-            sb.append("  CertStores: [" + certStores.toString() + "]\n");
-        sb.append("]");
+            sb.append("  CertStores: [").append(certStores.toString()).append("]\n");
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PolicyQualifierInfo.java
--- a/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Sun Aug 10 22:06:58 2014 -0300
@@ -163,10 +163,9 @@
         HexDumpEncoder enc = new HexDumpEncoder();
         StringBuilder sb = new StringBuilder();
         sb.append("PolicyQualifierInfo: [\n");
-        sb.append("  qualifierID: " + mId + "\n");
-        sb.append("  qualifier: " +
-            (mData == null ? "null" : enc.encodeBuffer(mData)) + "\n");
-        sb.append("]");
+        sb.append("  qualifierID: ").append(mId).append('\n');
+        sb.append("  qualifier: ").append(mData == null ? "null" : enc.encodeBuffer(mData)).append('\n');
+        sb.append(']');
         pqiString = sb.toString();
         return pqiString;
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/TrustAnchor.java
--- a/src/share/classes/java/security/cert/TrustAnchor.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/TrustAnchor.java	Sun Aug 10 22:06:58 2014 -0300
@@ -320,14 +320,13 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         if (pubKey != null) {
-            sb.append("  Trusted CA Public Key: " + pubKey.toString() + "\n");
-            sb.append("  Trusted CA Issuer Name: "
-                + String.valueOf(caName) + "\n");
+            sb.append("  Trusted CA Public Key: ").append(pubKey.toString()).append('\n');
+            sb.append("  Trusted CA Issuer Name: ").append(String.valueOf(caName)).append('\n');
         } else {
-            sb.append("  Trusted CA cert: " + trustedCert.toString() + "\n");
+            sb.append("  Trusted CA cert: ").append(trustedCert.toString()).append('\n');
         }
         if (nc != null)
-            sb.append("  Name Constraints: " + nc.toString() + "\n");
+            sb.append("  Name Constraints: ").append(nc.toString()).append('\n');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CRLSelector.java
--- a/src/share/classes/java/security/cert/X509CRLSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CRLSelector.java	Sun Aug 10 22:06:58 2014 -0300
@@ -572,17 +572,17 @@
             sb.append("  IssuerNames:\n");
             Iterator<Object> i = issuerNames.iterator();
             while (i.hasNext())
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
         }
         if (minCRL != null)
-            sb.append("  minCRLNumber: " + minCRL + "\n");
+            sb.append("  minCRLNumber: ").append(minCRL).append('\n');
         if (maxCRL != null)
-            sb.append("  maxCRLNumber: " + maxCRL + "\n");
+            sb.append("  maxCRLNumber: ").append(maxCRL).append('\n');
         if (dateAndTime != null)
-            sb.append("  dateAndTime: " + dateAndTime + "\n");
+            sb.append("  dateAndTime: ").append(dateAndTime).append('\n');
         if (certChecking != null)
-            sb.append("  Certificate being checked: " + certChecking + "\n");
-        sb.append("]");
+            sb.append("  Certificate being checked: ").append(certChecking).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CertSelector.java
--- a/src/share/classes/java/security/cert/X509CertSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CertSelector.java	Sun Aug 10 22:06:58 2014 -0300
@@ -1814,72 +1814,65 @@
         StringBuilder sb = new StringBuilder();
         sb.append("X509CertSelector: [\n");
         if (x509Cert != null) {
-            sb.append("  Certificate: " + x509Cert.toString() + "\n");
+            sb.append("  Certificate: ").append(x509Cert.toString()).append('\n');
         }
         if (serialNumber != null) {
-            sb.append("  Serial Number: " + serialNumber.toString() + "\n");
+            sb.append("  Serial Number: ").append(serialNumber.toString()).append('\n');
         }
         if (issuer != null) {
-            sb.append("  Issuer: " + getIssuerAsString() + "\n");
+            sb.append("  Issuer: ").append(getIssuerAsString()).append('\n');
         }
         if (subject != null) {
-            sb.append("  Subject: " + getSubjectAsString() + "\n");
+            sb.append("  Subject: ").append(getSubjectAsString()).append('\n');
         }
-        sb.append("  matchAllSubjectAltNames flag: "
-                  + String.valueOf(matchAllSubjectAltNames) + "\n");
+        sb.append("  matchAllSubjectAltNames flag: ")
+                .append(String.valueOf(matchAllSubjectAltNames))
+                .append('\n');
         if (subjectAlternativeNames != null) {
             sb.append("  SubjectAlternativeNames:\n");
             Iterator<List<?>> i = subjectAlternativeNames.iterator();
             while (i.hasNext()) {
                 List<?> list = i.next();
-                sb.append("    type " + list.get(0) +
-                          ", name " + list.get(1) + "\n");
+                sb.append("    type ").append(list.get(0)).append(", name ").append(list.get(1)).append('\n');
             }
         }
         if (subjectKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Subject Key Identifier: " +
-                      enc.encodeBuffer(subjectKeyID) + "\n");
+            sb.append("  Subject Key Identifier: ").append(enc.encodeBuffer(subjectKeyID)).append('\n');
         }
         if (authorityKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Authority Key Identifier: " +
-                      enc.encodeBuffer(authorityKeyID) + "\n");
+            sb.append("  Authority Key Identifier: ").append(enc.encodeBuffer(authorityKeyID)).append('\n');
         }
         if (certificateValid != null) {
-            sb.append("  Certificate Valid: " +
-                      certificateValid.toString() + "\n");
+            sb.append("  Certificate Valid: ").append(certificateValid.toString()).append('\n');
         }
         if (privateKeyValid != null) {
-            sb.append("  Private Key Valid: " +
-                      privateKeyValid.toString() + "\n");
+            sb.append("  Private Key Valid: ").append(privateKeyValid.toString()).append('\n');
         }
         if (subjectPublicKeyAlgID != null) {
-            sb.append("  Subject Public Key AlgID: " +
-                      subjectPublicKeyAlgID.toString() + "\n");
+            sb.append("  Subject Public Key AlgID: ").append(subjectPublicKeyAlgID.toString()).append('\n');
         }
         if (subjectPublicKey != null) {
-            sb.append("  Subject Public Key: " +
-                      subjectPublicKey.toString() + "\n");
+            sb.append("  Subject Public Key: ").append(subjectPublicKey.toString()).append('\n');
         }
         if (keyUsage != null) {
-            sb.append("  Key Usage: " + keyUsageToString(keyUsage) + "\n");
+            sb.append("  Key Usage: ").append(keyUsageToString(keyUsage)).append('\n');
         }
         if (keyPurposeSet != null) {
-            sb.append("  Extended Key Usage: " +
-                      keyPurposeSet.toString() + "\n");
+            sb.append("  Extended Key Usage: ").append(keyPurposeSet.toString()).append('\n');
         }
         if (policy != null) {
-            sb.append("  Policy: " + policy.toString() + "\n");
+            sb.append("  Policy: ").append(policy.toString()).append('\n');
         }
         if (pathToGeneralNames != null) {
             sb.append("  Path to names:\n");
             Iterator<GeneralNameInterface> i = pathToGeneralNames.iterator();
             while (i.hasNext()) {
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
             }
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/rmi/dgc/VMID.java
--- a/src/share/classes/java/rmi/dgc/VMID.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/rmi/dgc/VMID.java	Sun Aug 10 22:06:58 2014 -0300
@@ -124,8 +124,7 @@
         if (addr != null)
             for (int i = 0; i < addr.length; ++ i) {
                 int x = addr[i] & 0xFF;
-                sb.append((x < 0x10 ? "0" : "") +
-                          Integer.toString(x, 16));
+                sb.append(x < 0x10 ? "0" : "").append(Integer.toString(x, 16));
             }
         sb.append(':');
         sb.append(uid.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/lang/management/MemoryUsage.java
--- a/src/share/classes/java/lang/management/MemoryUsage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/MemoryUsage.java	Sun Aug 10 22:06:58 2014 -0300
@@ -238,11 +238,10 @@
      */
     public String toString() {
         StringBuilder buf = new StringBuilder();
-        buf.append("init = " + init + "(" + (init >> 10) + "K) ");
-        buf.append("used = " + used + "(" + (used >> 10) + "K) ");
-        buf.append("committed = " + committed + "(" +
-                   (committed >> 10) + "K) " );
-        buf.append("max = " + max + "(" + (max >> 10) + "K)");
+        buf.append("init = ").append(init).append('(').append(init >> 10).append("K) ");
+        buf.append("used = ").append(used).append('(').append(used >> 10).append("K) ");
+        buf.append("committed = ").append(committed).append('(').append(committed >> 10).append("K) ");
+        buf.append("max = ").append(max).append('(').append(max >> 10).append("K)");
         return buf.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/lang/management/ThreadInfo.java
--- a/src/share/classes/java/lang/management/ThreadInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/ThreadInfo.java	Sun Aug 10 22:06:58 2014 -0300
@@ -579,15 +579,17 @@
      * @return a string representation of this thread info.
      */
     public String toString() {
-        StringBuilder sb = new StringBuilder("\"" + getThreadName() + "\"" +
-                                             " Id=" + getThreadId() + " " +
-                                             getThreadState());
+    	StringBuilder sb = new StringBuilder();
+    	sb.append('\"').append(getThreadName()).append('\"')
+    	.append(" Id=").append(getThreadId()).append(' ')
+    	.append(getThreadState());
+
         if (getLockName() != null) {
-            sb.append(" on " + getLockName());
+            sb.append(" on ").append(getLockName());
         }
         if (getLockOwnerName() != null) {
-            sb.append(" owned by \"" + getLockOwnerName() +
-                      "\" Id=" + getLockOwnerId());
+            sb.append(" owned by \"").append(getLockOwnerName())
+                    .append("\" Id=").append(getLockOwnerId());
         }
         if (isSuspended()) {
             sb.append(" (suspended)");
@@ -599,21 +601,21 @@
         int i = 0;
         for (; i < stackTrace.length && i < MAX_FRAMES; i++) {
             StackTraceElement ste = stackTrace[i];
-            sb.append("\tat " + ste.toString());
+            sb.append("\tat ").append(ste.toString());
             sb.append('\n');
             if (i == 0 && getLockInfo() != null) {
                 Thread.State ts = getThreadState();
                 switch (ts) {
                     case BLOCKED:
-                        sb.append("\t-  blocked on " + getLockInfo());
+                        sb.append("\t-  blocked on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case TIMED_WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     default:
@@ -622,7 +624,7 @@
 
             for (MonitorInfo mi : lockedMonitors) {
                 if (mi.getLockedStackDepth() == i) {
-                    sb.append("\t-  locked " + mi);
+                    sb.append("\t-  locked ").append(mi);
                     sb.append('\n');
                 }
             }
@@ -634,10 +636,10 @@
 
        LockInfo[] locks = getLockedSynchronizers();
        if (locks.length > 0) {
-           sb.append("\n\tNumber of locked synchronizers = " + locks.length);
+           sb.append("\n\tNumber of locked synchronizers = ").append(locks.length);
            sb.append('\n');
            for (LockInfo li : locks) {
-               sb.append("\t- " + li);
+               sb.append("\t- ").append(li);
                sb.append('\n');
            }
        }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHParameters.java
--- a/src/share/classes/com/sun/crypto/provider/DHParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHParameters.java	Sun Aug 10 22:06:58 2014 -0300
@@ -138,7 +138,7 @@
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
         if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+            sb.append(LINE_SEP).append("l:").append(LINE_SEP).append("    ").append(this.l);
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHPublicKey.java
--- a/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Sun Aug 10 22:06:58 2014 -0300
@@ -269,7 +269,7 @@
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
         if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+            sb.append(LINE_SEP).append("l:").append(LINE_SEP).append("    ").append(this.l);
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/GCMParameters.java
--- a/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Sun Aug 10 22:06:58 2014 -0300
@@ -140,7 +140,7 @@
             = new StringBuilder(LINE_SEP + "    iv:" + LINE_SEP + "["
                 + encoder.encodeBuffer(iv) + "]");
 
-        sb.append(LINE_SEP + "tLen(bits):" + LINE_SEP + tLen*8 + LINE_SEP);
+        sb.append(LINE_SEP).append("tLen(bits):").append(LINE_SEP).append(tLen * 8).append(LINE_SEP);
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/OAEPParameters.java
--- a/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Sun Aug 10 22:06:58 2014 -0300
@@ -239,10 +239,9 @@
 
     protected String engineToString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("MD: " + mdName + "\n");
-        sb.append("MGF: MGF1" + mgfSpec.getDigestAlgorithm() + "\n");
-        sb.append("PSource: PSpecified " +
-            (p.length==0? "":Debug.toHexString(new BigInteger(p))) + "\n");
+        sb.append("MD: ").append(mdName).append('\n');
+        sb.append("MGF: MGF1").append(mgfSpec.getDigestAlgorithm()).append('\n');
+        sb.append("PSource: PSpecified ").append(p.length == 0 ? "" : Debug.toHexString(new BigInteger(p))).append('\n');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/RC2Parameters.java
--- a/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Sun Aug 10 22:06:58 2014 -0300
@@ -221,8 +221,9 @@
                 + encoder.encodeBuffer(iv) + "]");
 
         if (version != 0) {
-            sb.append(LINE_SEP + "version:" + LINE_SEP
-                + version + LINE_SEP);
+            sb.append(LINE_SEP).append("version:")
+                    .append(LINE_SEP).append(version)
+                    .append(LINE_SEP);
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Sun Aug 10 22:06:58 2014 -0300
@@ -65,7 +65,7 @@
                 "extractSubNet", "BINARY ARRAY :");
             StringBuilder sb = new StringBuilder();
             for(int i =0; i < addrLength; i++) {
-                sb.append((b[i] & 0xFF) + ":");
+                sb.append(b[i] & 0xFF).append(':');
             }
             SNMP_LOGGER.logp(Level.FINEST, NetMaskImpl.class.getName(),
                 "extractSubNet", sb.toString());
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Sun Aug 10 22:06:58 2014 -0300
@@ -204,7 +204,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Sun Aug 10 22:06:58 2014 -0300
@@ -379,7 +379,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(IDENTIFIER);
-   jjtn000.name.append( "." + t.image);
+   jjtn000.name.append('.').append(t.image);
       }
     } finally {
     if (jjtc000) {
@@ -408,7 +408,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -454,7 +454,7 @@
         }
         jj_consume_token(MARK);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -483,7 +483,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
       jj_consume_token(MASK);
       t = jj_consume_token(INTEGER_LITERAL);
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Sun Aug 10 22:06:58 2014 -0300
@@ -99,7 +99,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java
--- a/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Sun Aug 10 22:06:58 2014 -0300
@@ -479,10 +479,10 @@
      */
     public String printMessage() {
         StringBuilder sb = new StringBuilder();
-        sb.append("msgId : " + msgId + "\n");
-        sb.append("msgMaxSize : " + msgMaxSize + "\n");
-        sb.append("msgFlags : " + msgFlags + "\n");
-        sb.append("msgSecurityModel : " + msgSecurityModel + "\n");
+        sb.append("msgId : ").append(msgId).append('\n');
+        sb.append("msgMaxSize : ").append(msgMaxSize).append('\n');
+        sb.append("msgFlags : ").append(msgFlags).append('\n');
+        sb.append("msgSecurityModel : ").append(msgSecurityModel).append('\n');
 
         if (contextEngineId == null) {
             sb.append("contextEngineId : null");
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
--- a/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Sun Aug 10 22:06:58 2014 -0300
@@ -256,7 +256,7 @@
     private static String stringifyComponent(NameComponent comp) {
         StringBuilder one = new StringBuilder(escape(comp.id));
         if (comp.kind != null && !comp.kind.equals("")) {
-            one.append(kindSeparator + escape(comp.kind));
+            one.append(kindSeparator).append(escape(comp.kind));
         }
         if (one.length() == 0) {
             return ""+kindSeparator;  // if neither id nor kind specified
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java
--- a/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Sun Aug 10 22:06:58 2014 -0300
@@ -90,7 +90,7 @@
                         if (selected == -1) {
                             StringBuilder allChoices = new StringBuilder();
                             for (int j = 0; j <  choices.length; j++) {
-                                allChoices.append(choices[j] + ",");
+                                allChoices.append(choices[j]).append(',');
                             }
                             throw new IOException("Cannot match " +
                                 "'java.naming.security.sasl.realm' property value, '" +
diff -r dde9f5cfde5f src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
--- a/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Sun Aug 10 22:06:58 2014 -0300
@@ -167,9 +167,9 @@
         for (int i = 0; i < allchannelnames.length; i++) {
             if ((channelmask & m) != 0L) {
                 if (i < channelnames.length) {
-                    sb.append(channelnames[i] + " ");
+                    sb.append(channelnames[i]).append(' ');
                 } else {
-                    sb.append(allchannelnames[i] + " ");
+                    sb.append(allchannelnames[i]).append(' ');
                 }
             }
             m *= 2L;
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Sun Aug 10 22:06:58 2014 -0300
@@ -235,14 +235,14 @@
                     String nodeName = att.getNodeName();
                     if ((nodeName.equals("xmlns") || nodeName.startsWith("xmlns:"))
                         && !storedNamespaces.containsKey(att.getNodeName())) {
-                        sb.append(" " + nodeName + "=\"" + att.getNodeValue() + "\"");
+                        sb.append(' ').append(nodeName).append("=\"").append(att.getNodeValue()).append('\"');
                         storedNamespaces.put(nodeName, att.getNodeValue());
                     }
                 }
             }
             wk = wk.getParentNode();
         }
-        sb.append(">" + source + "</dummy>");
+        sb.append('>').append(source).append("</dummy>");
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Sun Aug 10 22:06:58 2014 -0300
@@ -85,7 +85,7 @@
             if (prefix.equals("xmlns")) {
                 sb.append("#default ");
             } else {
-                sb.append(prefix + " ");
+                sb.append(prefix).append(' ');
             }
         }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Sun Aug 10 22:06:58 2014 -0300
@@ -88,7 +88,7 @@
                 l += countQuotes(DN, j, k);
 
                 if ((k > 0) && (DN.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml) + ",");
+                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml)).append(',');
 
                     i = k + 1;
                     l = 0;
@@ -121,7 +121,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(parseATAV(trim(str.substring(i, k)), toXml) + "+");
+                sb.append(parseATAV(trim(str.substring(i, k)), toXml)).append('+');
 
                 i = k + 1;
                 l = 0;
@@ -369,7 +369,7 @@
         int k;
 
         for (int j = 0; (k = string.indexOf("\\20", j)) >= 0; j = k + 3) {
-            sb.append(trim(string.substring(i, k)) + "\\ ");
+            sb.append(trim(string.substring(i, k))).append("\\ ");
 
             i = k + 3;
         }
@@ -418,7 +418,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(trim(str.substring(i, k)) + replace);
+                sb.append(trim(str.substring(i, k))).append(replace);
 
                 i = k + 1;
                 l = 0;
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/CramMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Sun Aug 10 22:06:58 2014 -0300
@@ -196,8 +196,7 @@
 
         for (i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Sun Aug 10 22:06:58 2014 -0300
@@ -391,8 +391,7 @@
 
         for (int i = 0; i < digest.length; i ++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0"+
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/ParseException.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Sun Aug 10 22:06:58 2014 -0300
@@ -198,7 +198,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Sun Aug 10 22:06:58 2014 -0300
@@ -107,7 +107,7 @@
         default:
           if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
             String s = "0000" + Integer.toString(ch, 16);
-            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+            retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
           } else {
             retval.append(ch);
           }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
--- a/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Sun Aug 10 22:06:58 2014 -0300
@@ -338,10 +338,10 @@
             if (classpath.isEmpty()) {
                 String envcp = System.getProperty("env.class.path");
                 if ((envcp != null) && (envcp.length() > 0)) {
-                    munged.append(" -classpath " + envcp);
+                    munged.append(" -classpath ").append(envcp);
                 }
             } else {
-                munged.append(" -classpath " + classpath.asString());
+                munged.append(" -classpath ").append(classpath.asString());
             }
             return munged.toString();
         } else {
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Sun Aug 10 22:06:58 2014 -0300
@@ -386,37 +386,37 @@
                     }
                     case 'B': {
                         int val = 0xFF & byteAt(i, value);
-                        result.append("0x" + Integer.toString(val, 16));
+                        result.append("0x").append(Integer.toString(val, 16));
                         i++;
                         break;
                     }
                     case 'S': {
                         short val = shortAt(i, value);
                         i += 2;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'I': {
                         int val = intAt(i, value);
                         i += 4;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'J': {         // long
                         long val = longAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
                     case 'F': {
                         float val = floatAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 4;
                         break;
                     }
                     case 'D': {         // double
                         double val = doubleAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
@@ -425,7 +425,7 @@
                     }
                 }
             }
-            result.append("}");
+            result.append('}');
         }
         return result.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/util/Misc.java
--- a/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Sun Aug 10 22:06:58 2014 -0300
@@ -97,11 +97,11 @@
             } else if (ch == '&') {
                 sb.append("&amp;");
             } else if (ch < ' ') {
-                sb.append("&#" + Integer.toString(ch) + ";");
+                sb.append("&#").append(Integer.toString(ch)).append(';');
             } else {
                 int c = (ch & 0xFFFF);
                 if (c > 127) {
-                    sb.append("&#" + Integer.toString(c) + ";");
+                    sb.append("&#").append(Integer.toString(c)).append(';');
                 } else {
                     sb.append(ch);
                 }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
--- a/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Sun Aug 10 22:06:58 2014 -0300
@@ -881,12 +881,12 @@
             } else if (tag == JDWP.TypeTag.ARRAY) {
                 sb.append("ArrayType");
             } else {
-                sb.append("UNKNOWN TAG: " + tag);
+                sb.append("UNKNOWN TAG: ").append(tag);
             }
             if (signature != null) {
-                sb.append(", signature='" + signature + "'");
+                sb.append(", signature='").append(signature).append('\'');
             }
-            sb.append(", id=" + id);
+            sb.append(", id=").append(id);
             vm.printTrace(sb.toString());
         }
         if (id == 0) {

From weijun.wang at oracle.com  Mon Aug 11 07:35:11 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Mon, 11 Aug 2014 15:35:11 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
Message-ID: <CF840052-CBDA-413F-9957-B5A55C89D20A@oracle.com>

'\"' can be written as '"':

com_sun.diff:209:+                        sb.append(' ').append(nodeName).append("=\"").append(att.getNodeValue()).append('\"');
java_lang.diff:31:+    	sb.append('\"').append(getThreadName()).append('\"')
java_security.diff:78:+                        .append('\"');
sun_security.diff:95:+                    sb.append(principalInfo[i][0]).append(' ').append('\"').append(principalInfo[i][1]).append('\"');
sun_security.diff:108:+                        .append('\"');
sun_security.diff:122:+                sb.append(X500PRINCIPAL).append(" \"").append(suffix).append('\"');
sun_security.diff:312:+                    retval.append('\"').append(sbuffer.toString()).append('\"');

Still using append("."):

java_security.diff:107:+        sb.append("\n").append(type).append(" Cert Path: length = ").append(getCertificates().size()).append(".\n");
java_security.diff:148:+        sb.append("  serverName: ").append(serverName).append("\n");
javax_swing.diff:79:+        sb.append(getClass().getName()).append(" ").append(Integer.toString(hashCode()));
sun_security.diff:419:+        sb.append("X.509 CRL v").append(version + 1).append("\n");

I only read the security related files, but I grep for the two groups above.

Also, it's better to put rb.getString(...) to one line

sun_security.diff:268:+                            sb.append('\n').append(tab).append(rb.getString(
sun_security.diff:273:+                            sb.append('\n').append(tab).append(rb.getString(

And some lines are too long.

Thanks
Max
  
On Aug 11, 2014, at 11:29, Ot?vio Gon?alves de Santana <otaviojava at java.net> wrote:

> Done.
> 
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_2.zip
> 
> obs: stay the 2 chars to better performance.
> 
> 
> On Sun, Aug 10, 2014 at 8:03 PM, Claes Redestad <claes.redestad at oracle.com> wrote:
> +1
> 
> Some suggestions (mostly nits):
> 
> - in places like src/share/classes/java/util/regex/Pattern.java you introducesingle-char
>   strings which might use a char instead:
> 
> -                result.append("|"+next);
> +                result.append('|').append(next);
> 
> - in places like src/share/classes/sun/security/provider/PolicyFile.java
>   you end up with a sequence of String literal appends which could be merged into one:
> 
> -                sb.append(principalInfo[i][0] + " " +
> -                    "\"" + principalInfo[i][1] + "\"");
> +                sb.append(principalInfo[i][0]).append(" \"")
> +                    .append(principalInfo[i][1]).append('"');
> 
> - in some places like src/share/classes/java/text/ChoiceFormat.java
>   you end up doing append(""). I guess the empty string concatenation was used as a form
>   of primitive-to-string coercion and was probably always redundant already, but care needs
>   to be taken that doing the append directly behave as intended.
> 
>   I think it should be safe to just remove the empty string append in most cases:
> 
> -                result.append(""+choiceLimits[i]);
> +                result.append(choiceLimits[i]);
> 
> Thanks!
> 
> /Claes
> 
> On 2014-08-10 23:33, Ot?vio Gon?alves de Santana wrote:
> *Motivation:* Make another append instead of concat String inside of append
> 
> parameter in StringBuilder class. To avoid an extra StringBuilder created
> for the purpose of concatenating. So it will save memory and will faster
> than concat String.
> Doing a code to benchMark[1], the result is:
> 
> Benchmark                                                  Mode   Samples
>        Mean   Mean error    Units
> m.StringBuilderConcatBenchMark.stringBuilder              thrpt        10
>   6317444.705   108673.584    ops/s
> m.StringBuilderConcatBenchMark.stringBuilderWithConcat    thrpt        10
>   3354554.435    68353.924    ops/s
> 
> The webrev of all code is:
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat.zip
> <https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat.zip>
> 
> [1]
> 
> @State(Scope.Thread)
> @OutputTimeUnit(TimeUnit.SECONDS)
> public class StringBuilderConcatBenchMark {
> 
> 
>          private static final String F = "!!!!";
>   private static final String E = " running in Java ";
> private static final String D = " in the code ";
>   private static final String C = " to try impact ";
> private static final String B = " with some text ";
>   private static final String A = "Doing a test";
> 
> @GenerateMicroBenchmark
> public void stringBuilder(BlackHole bh) {
>   bh.consume(createBuilder(A, B, C, D, E, F));
> }
> 
> @GenerateMicroBenchmark
>   public void stringBuilderWithConcat(BlackHole bh) {
> bh.consume(createBuilderWithConcat(A, B, C, D, E, F));
>   }
> 
> private StringBuilder createBuilder(String... values) {
> StringBuilder text = new StringBuilder();
>   text.append(values[0]).append(values[1])
> .append(values[2]).append(values[3])
> .append(values[4]).append(values[5]);
>   return text;
> }
>   private StringBuilder createBuilderWithConcat(String... values) {
>   StringBuilder text = new StringBuilder();
> text.append(values[0] + values[1])
> .append(values[2] + values[3])
>   .append(values[4]+ values[5]);
> return text;
> }
> }
> 
> 
> 
> 
> 
> -- 
> Ot?vio Gon?alves de Santana
> 
> blog:     http://otaviosantana.blogspot.com.br/
> twitter: http://twitter.com/otaviojava
> site:     http://about.me/otaviojava
> 55 (11) 98255-3513
> <sun_tools.diff><sun_security.diff><sun_net.diff><sun_management.diff><sun_launcher.diff><sun_font.diff><javax_swing.diff><javax_sound.diff><javax_security.diff><javax_naming.diff><javax_crypto.diff><javax_,anagement.diff><java_util.diff><java_text.diff><java_security.diff><java_rmi.diff><java_lang.diff><com_sun.diff>



From artem.malinko at oracle.com  Mon Aug 11 07:39:27 2014
From: artem.malinko at oracle.com (artem malinko)
Date: Mon, 11 Aug 2014 11:39:27 +0400
Subject: <Swing Dev> Review request for 8042835: unexpected mnemonic in
 JFileChooser
In-Reply-To: <53E38B53.4030401@oracle.com>
References: <53E219D3.3070402@oracle.com> <53E38762.5080409@oracle.com>
	<53E38B53.4030401@oracle.com>
Message-ID: <53E8732F.4050502@oracle.com>

Hello again. Could somebody else join to the review please?

On 8/7/2014 6:21 PM, artem malinko wrote:
> Thank you, Alexandr.
>
> > The link to the webrev points to the 8047288 fix instead of 8042835
> Sorry, some weird copy and paste.
>
> Here is the good link for the next reviewer:
> http://cr.openjdk.java.net/~dmarkov/8042835/webrev.00/
>
> On 8/7/2014 6:04 PM, Alexander Scherbatiy wrote:
>>
>>  The fix looks good to me.
>>
>>  The link to the webrev points to the 8047288 fix instead of 8042835.
>>
>>  Thanks,
>>  Alexandr.
>>
>> On 8/6/2014 4:04 PM, artem malinko wrote:
>>> Hello, Swing team.
>>>
>>> Please review a fix for the issue:
>>> https://bugs.openjdk.java.net/browse/JDK-8042835
>>> The fix is available at:
>>> http://cr.openjdk.java.net/~dmarkov/8042835/webrev.00/ 
>>> <http://cr.openjdk.java.net/%7Emcherkas/artem/8047288/webrev.01/>
>>>
>>> Bug relates to:
>>> https://bugs.openjdk.java.net/browse/JDK-5081721
>>> https://bugs.openjdk.java.net/browse/JDK-7174970
>>> Back then not all properties were fixed. This fix simply finishes 
>>> started work.
>>>
>>> Thank you. 
>>
>



From claes.redestad at oracle.com  Sun Aug 10 23:03:32 2014
From: claes.redestad at oracle.com (Claes Redestad)
Date: Mon, 11 Aug 2014 01:03:32 +0200
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
Message-ID: <53E7FA44.9050207@oracle.com>

+1

Some suggestions (mostly nits):

- in places like src/share/classes/java/util/regex/Pattern.java you 
introducesingle-char
   strings which might use a char instead:

-                result.append("|"+next);
+                result.append('|').append(next);

- in places like src/share/classes/sun/security/provider/PolicyFile.java
   you end up with a sequence of String literal appends which could be 
merged into one:

-                sb.append(principalInfo[i][0] + " " +
-                    "\"" + principalInfo[i][1] + "\"");
+                sb.append(principalInfo[i][0]).append(" \"")
+                    .append(principalInfo[i][1]).append('"');

- in some places like src/share/classes/java/text/ChoiceFormat.java
   you end up doing append(""). I guess the empty string concatenation was used as a form
   of primitive-to-string coercion and was probably always redundant already, but care needs
   to be taken that doing the append directly behave as intended.

   I think it should be safe to just remove the empty string append in most cases:

-                result.append(""+choiceLimits[i]);
+                result.append(choiceLimits[i]);

Thanks!

/Claes

On 2014-08-10 23:33, Ot?vio Gon?alves de Santana wrote:
> *Motivation:* Make another append instead of concat String inside of append
> parameter in StringBuilder class. To avoid an extra StringBuilder created
> for the purpose of concatenating. So it will save memory and will faster
> than concat String.
> Doing a code to benchMark[1], the result is:
>
> Benchmark                                                  Mode   Samples
>        Mean   Mean error    Units
> m.StringBuilderConcatBenchMark.stringBuilder              thrpt        10
>   6317444.705   108673.584    ops/s
> m.StringBuilderConcatBenchMark.stringBuilderWithConcat    thrpt        10
>   3354554.435    68353.924    ops/s
>
> The webrev of all code is:
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat.zip
> <https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat.zip>
>
> [1]
>
> @State(Scope.Thread)
> @OutputTimeUnit(TimeUnit.SECONDS)
> public class StringBuilderConcatBenchMark {
>
>
>          private static final String F = "!!!!";
>   private static final String E = " running in Java ";
> private static final String D = " in the code ";
>   private static final String C = " to try impact ";
> private static final String B = " with some text ";
>   private static final String A = "Doing a test";
>
> @GenerateMicroBenchmark
> public void stringBuilder(BlackHole bh) {
>   bh.consume(createBuilder(A, B, C, D, E, F));
> }
>
> @GenerateMicroBenchmark
>   public void stringBuilderWithConcat(BlackHole bh) {
> bh.consume(createBuilderWithConcat(A, B, C, D, E, F));
>   }
>
> private StringBuilder createBuilder(String... values) {
> StringBuilder text = new StringBuilder();
>   text.append(values[0]).append(values[1])
> .append(values[2]).append(values[3])
> .append(values[4]).append(values[5]);
>   return text;
> }
>   private StringBuilder createBuilderWithConcat(String... values) {
>   StringBuilder text = new StringBuilder();
> text.append(values[0] + values[1])
> .append(values[2] + values[3])
>   .append(values[4]+ values[5]);
> return text;
> }
> }
>



From andrej.golovnin at gmail.com  Mon Aug 11 09:42:41 2014
From: andrej.golovnin at gmail.com (Andrej Golovnin)
Date: Mon, 11 Aug 2014 11:42:41 +0200
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
Message-ID: <CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>

Hi Ot?vio,

the class src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java is generated
from the grammar

src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj

Therefore when you are going to change the Parser class, then you must
change the grammar files too. In other case your changes maybe overwritten
in the future, when someone decides to regenerate the Parser class.

The classes

src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java
src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java

are generated from the templates provided by JavaCC

https://java.net/projects/javacc/sources/svn/show/trunk/src/main/resources/templates?rev=689

You should consider contributing you changes to the ParseException and
TokenMgrError classes to the JavaCC project as well.


In the class
src/share/classes/javax/management/openmbean/CompositeType.java you have
added the
annotation @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
instead of fixing the concatenation inside the append method. Why?


And I would like to suggest to drop explicit usage of StringBuilder in some
methods at all to improve code readability. Take look for example at the
class src/share/classes/java/lang/management/MemoryUsage.java and its
#toString()-method:

Before your change:

 239     public String toString() {
 240         StringBuilder buf = new StringBuilder();
 241         buf.append("init = " + init + "(" + (init >> 10) + "K) ");
 242         buf.append("used = " + used + "(" + (used >> 10) + "K) ");
 243         buf.append("committed = " + committed + "(" +
 244                    (committed >> 10) + "K) " );
 245         buf.append("max = " + max + "(" + (max >> 10) + "K)");
 246         return buf.toString();
 247     }

After your change:

 239     public String toString() {
 240         StringBuilder buf = new StringBuilder();
 241         buf.append("init = ").append(init).append('(').append(init >>
10).append("K) ");
 242         buf.append("used = ").append(used).append('(').append(used >>
10).append("K) ");
 243         buf.append("committed =
").append(committed).append('(').append(committed >> 10).append("K) ");
 244         buf.append("max = ").append(max).append('(').append(max >>
10).append("K)");
 245         return buf.toString();
 246     }

And if we drop explicit usage of StringBuilder and let the Java compiler do
its magic, then it looks like this:

 239     public String toString() {
 240         return "init = " + init + "(" + (init >> 10) + "K) "
 241                + "used = " + used + "(" + (used >> 10) + "K) "
 242                + "committed = " + committed + "(" + (committed >> 10)
+ "K) "
 243                + "max = " + max + "(" + (max >> 10) + "K)";
 244     }

For me this code is easier to read and understand, then the code before and
after your change. But this is only my opinion. Other candidates for such
change may be:

src/share/classes/com/sun/crypto/provider/DHParameters.java
src/share/classes/com/sun/crypto/provider/DHPublicKey.java
src/share/classes/com/sun/crypto/provider/GCMParameters.java
src/share/classes/com/sun/crypto/provider/OAEPParameters.java
src/share/classes/com/sun/crypto/provider/RC2Parameters.java
src/share/classes/java/security/CodeSigner.java
src/share/classes/java/security/cert/CollectionCertStoreParameters.java
src/share/classes/java/security/cert/LDAPCertStoreParameters.java
src/share/classes/java/security/cert/PKIXBuilderParameters.java
src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
src/share/classes/java/security/cert/PolicyQualifierInfo.java
src/share/classes/java/util/Scanner.java
src/share/classes/java/util/regex/Matcher.java
src/share/classes/javax/management/relation/RoleInfo.java
src/share/classes/javax/naming/RefAddr.java
src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
src/share/classes/sun/security/provider/certpath/CertId.java
src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
src/share/classes/sun/security/x509/DistributionPointName.java
src/share/classes/sun/security/x509/PolicyInformation.java
src/share/classes/sun/security/x509/X509CertImpl.java


In the #toString()-method
of src/share/classes/javax/swing/RepaintManager.java we can avoid creation
of StringBuilder if we change it from:

 992     public synchronized String toString() {
 993         StringBuilder sb = new StringBuilder();
 994         if(dirtyComponents != null)
 995             sb.append(dirtyComponents);
 996         return sb.toString();
 997     }

to:

 992     public synchronized String toString() {
 993         return dirtyComponents != null ? dirtyComponents.toString : "";
 994     }


In src/share/classes/sun/net/www/HeaderParser.java please change the line
223 to use StringBuilder instead of StringBuffer.

In the class src/share/classes/sun/security/ssl/ServerNameExtension.java
the #toString()-method can be changed from:

 268     public String toString() {
 269         StringBuilder sb = new StringBuilder();
 270         for (SNIServerName sniName : sniMap.values()) {
 271             sb.append('[').append(sniName).append(']');
 272         }
 273
 274         return "Extension " + type + ", server_name: " + sb;
 275     }

to:

 268     public String toString() {
 269         StringBuilder sb = new StringBuilder();
 270         sb.append("Extension ").append(type).append(", server_name: ");
 271         for (SNIServerName sniName : sniMap.values()) {
 272             sb.append('[').append(sniName).append(']');
 273         }
 274
 275         return sb.toString();
 276     }

to avoid creation of an additional StringBuilder-object in the line 274.
Similar change can be applied to the class
 src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java.

Best regards,
Andrej Golovnin

On Mon, Aug 11, 2014 at 5:29 AM, Ot?vio Gon?alves de Santana <
otaviojava at java.net> wrote:

> Done.
>
>
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_2.zip
>
> obs: stay the 2 chars to better performance.
>
>
> On Sun, Aug 10, 2014 at 8:03 PM, Claes Redestad <claes.redestad at oracle.com
> >
> wrote:
>
> > +1
> >
> > Some suggestions (mostly nits):
> >
> > - in places like src/share/classes/java/util/regex/Pattern.java you
> > introducesingle-char
> >   strings which might use a char instead:
> >
> > -                result.append("|"+next);
> > +                result.append('|').append(next);
> >
> > - in places like src/share/classes/sun/security/provider/PolicyFile.java
> >   you end up with a sequence of String literal appends which could be
> > merged into one:
> >
> > -                sb.append(principalInfo[i][0] + " " +
> > -                    "\"" + principalInfo[i][1] + "\"");
> > +                sb.append(principalInfo[i][0]).append(" \"")
> > +                    .append(principalInfo[i][1]).append('"');
> >
> > - in some places like src/share/classes/java/text/ChoiceFormat.java
> >   you end up doing append(""). I guess the empty string concatenation was
> > used as a form
> >   of primitive-to-string coercion and was probably always redundant
> > already, but care needs
> >   to be taken that doing the append directly behave as intended.
> >
> >   I think it should be safe to just remove the empty string append in
> most
> > cases:
> >
> > -                result.append(""+choiceLimits[i]);
> > +                result.append(choiceLimits[i]);
> >
> > Thanks!
> >
> > /Claes
> >
> > On 2014-08-10 23:33, Ot?vio Gon?alves de Santana wrote:
> >
> >> *Motivation:* Make another append instead of concat String inside of
> >> append
> >>
> >> parameter in StringBuilder class. To avoid an extra StringBuilder
> created
> >> for the purpose of concatenating. So it will save memory and will faster
> >> than concat String.
> >> Doing a code to benchMark[1], the result is:
> >>
> >> Benchmark                                                  Mode
> Samples
> >>        Mean   Mean error    Units
> >> m.StringBuilderConcatBenchMark.stringBuilder              thrpt
>  10
> >>   6317444.705   108673.584    ops/s
> >> m.StringBuilderConcatBenchMark.stringBuilderWithConcat    thrpt
>  10
> >>   3354554.435    68353.924    ops/s
> >>
> >> The webrev of all code is:
> >> https://dl.dropboxusercontent.com/u/16109193/open_jdk/
> >> string_builder_concat.zip
> >> <https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_
> >> builder_concat.zip>
> >>
> >> [1]
> >>
> >> @State(Scope.Thread)
> >> @OutputTimeUnit(TimeUnit.SECONDS)
> >> public class StringBuilderConcatBenchMark {
> >>
> >>
> >>          private static final String F = "!!!!";
> >>   private static final String E = " running in Java ";
> >> private static final String D = " in the code ";
> >>   private static final String C = " to try impact ";
> >> private static final String B = " with some text ";
> >>   private static final String A = "Doing a test";
> >>
> >> @GenerateMicroBenchmark
> >> public void stringBuilder(BlackHole bh) {
> >>   bh.consume(createBuilder(A, B, C, D, E, F));
> >> }
> >>
> >> @GenerateMicroBenchmark
> >>   public void stringBuilderWithConcat(BlackHole bh) {
> >> bh.consume(createBuilderWithConcat(A, B, C, D, E, F));
> >>   }
> >>
> >> private StringBuilder createBuilder(String... values) {
> >> StringBuilder text = new StringBuilder();
> >>   text.append(values[0]).append(values[1])
> >> .append(values[2]).append(values[3])
> >> .append(values[4]).append(values[5]);
> >>   return text;
> >> }
> >>   private StringBuilder createBuilderWithConcat(String... values) {
> >>   StringBuilder text = new StringBuilder();
> >> text.append(values[0] + values[1])
> >> .append(values[2] + values[3])
> >>   .append(values[4]+ values[5]);
> >> return text;
> >> }
> >> }
> >>
> >>
> >
>
>
> --
> Ot?vio Gon?alves de Santana
>
> blog:     http://otaviosantana.blogspot.com.br/
> twitter: http://twitter.com/otaviojava
> site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
> 55 (11) 98255-3513
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140811/9e52c27c/attachment.html>

From otaviojava at java.net  Mon Aug 11 11:25:41 2014
From: otaviojava at java.net (=?UTF-8?Q?Ot=C3=A1vio_Gon=C3=A7alves_de_Santana?=)
Date: Mon, 11 Aug 2014 08:25:41 -0300
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
Message-ID: <CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>

Really thank you everyone.

About Warning, sorry my mistake, this warning is from IntelliJ.
Removed long lines, replace StringBuffer to StringBuilder and I did the
optimizations.
About the template in Parser.jjt, TokenMgrError.java, etc. I don't know how
can do that. Can anyone help me?
About readable of code I just renamed this class to sb instead of buf,
strbuf, etc. Because using StringBuilder beyond be more explicit I can use
char instead of a single String.

https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_3.zip


On Mon, Aug 11, 2014 at 7:56 AM, Pavel Rappo <pavel.rappo at oracle.com> wrote:

> > In the class
> > src/share/classes/javax/management/openmbean/CompositeType.java you have
> > added the
> > annotation
> @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
> > instead of fixing the concatenation inside the append method. Why?
>
> +1 Moreover, I wonder where this value comes from? I've never seen it
> before. Here are warnings that javac supports:
>
>
> all,auxiliaryclass,cast,classfile,deprecation,dep-ann,divzero,empty,fallthrough,finally,options,overloads,overrides,path,processing,rawtypes,serial,static,try,unchecked,varargs
>
> It doesn't look like one of Eclipse's warnings either.
>
> > And I would like to suggest to drop explicit usage of StringBuilder in
> some
> > methods at all to improve code readability.
>
> Agree.
>
> -Pavel
>
>


-- 
Ot?vio Gon?alves de Santana

blog:     http://otaviosantana.blogspot.com.br/
twitter: http://twitter.com/otaviojava
site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
55 (11) 98255-3513
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140811/c4acd7c8/attachment.html>
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/ThreadTab.java
--- a/src/share/classes/sun/tools/jconsole/ThreadTab.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/ThreadTab.java	Mon Aug 11 08:18:34 2014 -0300
@@ -368,7 +368,7 @@
                             sb.append(Messages.STACK_TRACE);
                             int index = 0;
                             for (StackTraceElement e : ti.getStackTrace()) {
-                                sb.append(e.toString()+"\n");
+                                sb.append(e.toString()).append('\n');
                                 if (monitors != null) {
                                     for (MonitorInfo mi : monitors) {
                                         if (mi.getLockedStackDepth() == index) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Mon Aug 11 08:18:34 2014 -0300
@@ -79,25 +79,25 @@
             String textColor = String.format("%06x",
                                              foreground.getRGB() & 0xFFFFFF);
             StringBuilder sb = new StringBuilder();
-            sb.append("<html><body text=#"+textColor+"><table width=\"100%\">");
+            sb.append("<html><body text=#").append(textColor).append("><table width=\"100%\">");
             for (int i = 0; i < arr.length; i++) {
                 if (i % 2 == 0) {
-                    sb.append("<tr style=\"background-color: " +
-                            evenRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(evenRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 } else {
-                    sb.append("<tr style=\"background-color: " +
-                            oddRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(oddRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 }
             }
             if (arr.length == 0) {
-                sb.append("<tr style=\"background-color: " +
-                        evenRowColorStr + "\"><td></td></tr>");
+				sb.append("<tr style=\"background-color: ")
+						.append(evenRowColorStr).append("\"><td></td></tr>");
             }
             sb.append("</table></body></html>");
             arrayEditor.setText(sb.toString());
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XTree.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Mon Aug 11 08:18:34 2014 -0300
@@ -507,13 +507,13 @@
         // key order defined by the "orderedKeyPropertyList"
         for (String key : orderedKeyPropertyList) {
             if (map.containsKey(key)) {
-                sb.append(key + "=" + map.get(key) + ",");
+                sb.append(key).append('=').append(map.get(key)).append(',');
                 map.remove(key);
             }
         }
         // Add the remaining key/value pairs to the buffer
         for (Map.Entry<String, String> entry : map.entrySet()) {
-            sb.append(entry.getKey() + "=" + entry.getValue() + ",");
+            sb.append(entry.getKey()).append('=').append(entry.getValue()).append(',');
         }
         String orderedKeyPropertyListString = sb.toString();
         orderedKeyPropertyListString = orderedKeyPropertyListString.substring(
@@ -622,7 +622,7 @@
                     //
                     StringBuilder sb = new StringBuilder();
                     for (MBeanParameterInfo mbpi : mboi.getSignature()) {
-                        sb.append(mbpi.getType() + ",");
+                        sb.append(mbpi.getType()).append(',');
                     }
                     String signature = sb.toString();
                     if (signature.length() > 0) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jps/Jps.java
--- a/src/share/classes/sun/tools/jps/Jps.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jps/Jps.java	Mon Aug 11 08:18:34 2014 -0300
@@ -92,28 +92,28 @@
                     vm = monitoredHost.getMonitoredVm(id, 0);
 
                     errorString = " -- main class information unavailable";
-                    output.append(" " + MonitoredVmUtil.mainClass(vm,
+                    output.append(' ').append(MonitoredVmUtil.mainClass(vm,
                             arguments.showLongPaths()));
 
                     if (arguments.showMainArgs()) {
                         errorString = " -- main args information unavailable";
                         String mainArgs = MonitoredVmUtil.mainArgs(vm);
                         if (mainArgs != null && mainArgs.length() > 0) {
-                            output.append(" " + mainArgs);
+                            output.append(' ').append(mainArgs);
                         }
                     }
                     if (arguments.showVmArgs()) {
                         errorString = " -- jvm args information unavailable";
                         String jvmArgs = MonitoredVmUtil.jvmArgs(vm);
                         if (jvmArgs != null && jvmArgs.length() > 0) {
-                          output.append(" " + jvmArgs);
+                          output.append(' ').append(jvmArgs);
                         }
                     }
                     if (arguments.showVmFlags()) {
                         errorString = " -- jvm flags information unavailable";
                         String jvmFlags = MonitoredVmUtil.jvmFlags(vm);
                         if (jvmFlags != null && jvmFlags.length() > 0) {
-                            output.append(" " + jvmFlags);
+                            output.append(' ').append(jvmFlags);
                         }
                     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/RawOutputFormatter.java
--- a/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Mon Aug 11 08:18:34 2014 -0300
@@ -50,7 +50,7 @@
             StringBuilder headerBuilder = new StringBuilder();
             for (Iterator<Monitor> i = logged.iterator(); i.hasNext(); /* empty */ ) {
                 Monitor m = i.next();
-                headerBuilder.append(m.getName() + " ");
+                headerBuilder.append(m.getName()).append(' ');
             }
             header = headerBuilder.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/SyntaxException.java
--- a/src/share/classes/sun/tools/jstat/SyntaxException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/SyntaxException.java	Mon Aug 11 08:18:34 2014 -0300
@@ -65,7 +65,7 @@
     public SyntaxException(int lineno, Set<String> expected, Token found) {
         StringBuilder msg = new StringBuilder();
 
-        msg.append("Syntax error at line " + lineno + ": Expected one of \'");
+        msg.append("Syntax error at line ").append(lineno).append(": Expected one of \'");
 
         boolean first = true;
         for (Iterator<String> i = expected.iterator(); i.hasNext(); /* empty */) {
@@ -74,11 +74,11 @@
                 msg.append(keyWord);
                 first = false;
             } else {
-                msg.append("|" + keyWord);
+                msg.append('|').append(keyWord);
             }
         }
 
-        msg.append("\', Found " + found.toMessage());
+        msg.append("\', Found ").append(found.toMessage());
         message = msg.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/Token.java
--- a/src/share/classes/sun/tools/jstat/Token.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/Token.java	Mon Aug 11 08:18:34 2014 -0300
@@ -89,18 +89,18 @@
             sb.append("ttype=TT_EOF");
             break;
         case StreamTokenizer.TT_NUMBER:
-            sb.append("ttype=TT_NUM,").append("nval="+nval);
+            sb.append("ttype=TT_NUM,").append("nval=").append(nval);
             break;
         case StreamTokenizer.TT_WORD:
             if (sval == null) {
                 sb.append("ttype=TT_WORD:IDENTIFIER");
             } else {
-                sb.append("ttype=TT_WORD:").append("sval="+sval);
+                sb.append("ttype=TT_WORD:").append("sval=").append(sval);
             }
             break;
         default:
             if (ttype == (int)'"') {
-                sb.append("ttype=TT_STRING:").append("sval="+sval);
+                sb.append("ttype=TT_STRING:").append("sval=").append(sval);
             } else {
                 sb.append("ttype=TT_CHAR:").append((char)ttype);
             }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstatd/RemoteHostImpl.java
--- a/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Mon Aug 11 08:18:34 2014 -0300
@@ -68,7 +68,7 @@
 
         sb.append("local://").append(lvmid).append("@localhost");
         if (mode != null) {
-            sb.append("?mode=" + mode);
+            sb.append("?mode=").append(mode);
         }
 
         String vmidStr = sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/security/acl/AclEntryImpl.java
--- a/src/share/classes/sun/security/acl/AclEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/acl/AclEntryImpl.java	Mon Aug 11 08:18:34 2014 -0300
@@ -147,13 +147,13 @@
             s.append("Group.");
         else
             s.append("User.");
-        s.append(user + "=");
+        s.append(user).append('=');
         Enumeration<Permission> e = permissions();
         while(e.hasMoreElements()) {
             Permission p = e.nextElement();
             s.append(p);
             if (e.hasMoreElements())
-                s.append(",");
+                s.append(',');
         }
         return new String(s);
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
--- a/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Mon Aug 11 08:18:34 2014 -0300
@@ -640,8 +640,7 @@
 
         for (int i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
--- a/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Mon Aug 11 08:18:34 2014 -0300
@@ -158,8 +158,8 @@
         }
         sb.append(hexDumper.encode(certHash));
         if (issuer != null && serialNumber != null) {
-            sb.append("\n\tIssuer: " + issuer + "\n");
-            sb.append("\t" + serialNumber);
+            sb.append("\n\tIssuer: ").append(issuer).append('\n');
+            sb.append('\t').append(serialNumber);
         }
         sb.append("\n]");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs11/P11KeyStore.java
--- a/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Mon Aug 11 08:18:34 2014 -0300
@@ -196,24 +196,24 @@
             } else if (type == ATTR_CLASS_CERT) {
                 sb.append("\ttype=[trusted cert]\n");
             }
-            sb.append("\tlabel=[" + label + "]\n");
+            sb.append("\tlabel=[").append(label).append("]\n");
             if (id == null) {
                 sb.append("\tid=[null]\n");
             } else {
-                sb.append("\tid=" + P11KeyStore.getID(id) + "\n");
+                sb.append("\tid=").append(P11KeyStore.getID(id)).append('\n');
             }
-            sb.append("\ttrusted=[" + trusted + "]\n");
-            sb.append("\tmatched=[" + matched + "]\n");
+            sb.append("\ttrusted=[").append(trusted).append("]\n");
+            sb.append("\tmatched=[").append(matched).append("]\n");
             if (cert == null) {
                 sb.append("\tcert=[null]\n");
             } else {
-                sb.append("\tcert=[\tsubject: " +
-                        cert.getSubjectX500Principal() +
-                        "\n\t\tissuer: " +
-                        cert.getIssuerX500Principal() +
-                        "\n\t\tserialNum: " +
-                        cert.getSerialNumber().toString() +
-                        "]");
+                sb.append("\tcert=[\tsubject: ")
+                        .append(cert.getSubjectX500Principal())
+                        .append("\n\t\tissuer: ")
+                        .append(cert.getIssuerX500Principal())
+                        .append("\n\t\tserialNum: ")
+                        .append(cert.getSerialNumber().toString())
+                        .append(']');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/PolicyFile.java
--- a/src/share/classes/sun/security/provider/PolicyFile.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/PolicyFile.java	Mon Aug 11 08:18:34 2014 -0300
@@ -1500,8 +1500,8 @@
                     if (i != 0) {
                         sb.append(", ");
                     }
-                    sb.append(principalInfo[i][0] + " " +
-                        "\"" + principalInfo[i][1] + "\"");
+					sb.append(principalInfo[i][0]).append(' ').append('"')
+							.append(principalInfo[i][1]).append('"');
                 }
                 if (pli.hasNext()) {
                     sb.append(", ");
@@ -1774,17 +1774,17 @@
         Principal[] principals = pd.getPrincipals();
         String pals = "<no principals>";
         if (principals != null && principals.length > 0) {
-            StringBuilder palBuf = new StringBuilder("(principals ");
+            StringBuilder palSB = new StringBuilder("(principals ");
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                              " \"" + principals[i].getName() +
-                              "\"");
+                palSB.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append('"');
                 if (i < principals.length-1)
-                    palBuf.append(", ");
+                    palSB.append(", ");
                 else
-                    palBuf.append(")");
+                    palSB.append(')');
             }
-            pals = palBuf.toString();
+            pals = palSB.toString();
         }
         return "PD CodeSource: "
                 + pd.getCodeSource()
@@ -1884,7 +1884,7 @@
                     throw new Exception(form.format(source));
                 }
 
-                sb.append(X500PRINCIPAL + " \"" + suffix + "\"");
+                sb.append(X500PRINCIPAL).append(" \"").append(suffix).append('"');
                 startIndex = e+2;
             } else {
                 MessageFormat form = new MessageFormat
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/CertId.java
--- a/src/share/classes/sun/security/provider/certpath/CertId.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/CertId.java	Mon Aug 11 08:18:34 2014 -0300
@@ -223,13 +223,13 @@
     @Override public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CertId \n");
-        sb.append("Algorithm: " + hashAlgId.toString() +"\n");
+        sb.append("Algorithm: ").append(hashAlgId.toString()).append('\n');
         sb.append("issuerNameHash \n");
         HexDumpEncoder encoder = new HexDumpEncoder();
         sb.append(encoder.encode(issuerNameHash));
         sb.append("\nissuerKeyHash: \n");
         sb.append(encoder.encode(issuerKeyHash));
-        sb.append("\n" +  certSerialNumber.toString());
+        sb.append('\n').append(certSerialNumber.toString());
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/OCSPResponse.java
--- a/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Mon Aug 11 08:18:34 2014 -0300
@@ -812,14 +812,14 @@
             StringBuilder sb = new StringBuilder();
             sb.append("SingleResponse:  \n");
             sb.append(certId);
-            sb.append("\nCertStatus: "+ certStatus + "\n");
+            sb.append("\nCertStatus: ").append(certStatus).append('\n');
             if (certStatus == CertStatus.REVOKED) {
-                sb.append("revocationTime is " + revocationTime + "\n");
-                sb.append("revocationReason is " + revocationReason + "\n");
+                sb.append("revocationTime is ").append(revocationTime).append('\n');
+                sb.append("revocationReason is ").append(revocationReason).append('\n');
             }
-            sb.append("thisUpdate is " + thisUpdate + "\n");
+            sb.append("thisUpdate is ").append(thisUpdate).append('\n');
             if (nextUpdate != null) {
-                sb.append("nextUpdate is " + nextUpdate + "\n");
+                sb.append("nextUpdate is ").append(nextUpdate).append('\n');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
--- a/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Mon Aug 11 08:18:34 2014 -0300
@@ -124,7 +124,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Build Forward Flag: " + String.valueOf(buildForward) + "\n");
+        sb.append("  Build Forward Flag: ").append(String.valueOf(buildForward)).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/HandshakeMessage.java
--- a/src/share/classes/sun/security/ssl/HandshakeMessage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/HandshakeMessage.java	Mon Aug 11 08:18:34 2014 -0300
@@ -1478,7 +1478,7 @@
                 boolean opened = false;
                 for (SignatureAndHashAlgorithm signAlg : algorithms) {
                     if (opened) {
-                        sb.append(", " + signAlg.getAlgorithmName());
+                        sb.append(", ").append(signAlg.getAlgorithmName());
                     } else {
                         sb.append(signAlg.getAlgorithmName());
                         opened = true;
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/ServerNameExtension.java
--- a/src/share/classes/sun/security/ssl/ServerNameExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/ServerNameExtension.java	Mon Aug 11 08:18:34 2014 -0300
@@ -267,11 +267,11 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
+        sb.append("Extension ").append(type).append(", server_name: ");
         for (SNIServerName sniName : sniMap.values()) {
-            sb.append("[" + sniName + "]");
+            sb.append('[').append(sniName).append(']');
         }
-
-        return "Extension " + type + ", server_name: " + sb;
+        return sb.toString();
     }
 
     private static class UnknownServerName extends SNIServerName {
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
--- a/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Mon Aug 11 08:18:34 2014 -0300
@@ -119,17 +119,17 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
+        sb.append("Extension ").append(type).append(", signature_algorithms: ");
         boolean opened = false;
         for (SignatureAndHashAlgorithm signAlg : algorithms) {
             if (opened) {
-                sb.append(", " + signAlg.getAlgorithmName());
+                sb.append(", ").append(signAlg.getAlgorithmName());
             } else {
                 sb.append(signAlg.getAlgorithmName());
                 opened = true;
             }
         }
-
-        return "Extension " + type + ", signature_algorithms: " + sb;
+        return  sb.toString();
     }
 }
 
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
--- a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Mon Aug 11 08:18:34 2014 -0300
@@ -113,7 +113,7 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("Extension " + type + ", curve names: {");
+        sb.append("Extension ").append(type).append(", curve names: {");
         boolean first = true;
         for (int curveId : curveIds) {
             if (first) {
@@ -138,7 +138,7 @@
             } else if (curveId == ARBITRARY_CHAR2) {
                 sb.append("arbitrary_explicit_char2_curves");
             } else {
-                sb.append("unknown curve " + curveId);
+                sb.append("unknown curve ").append(curveId);
             }
         }
         sb.append("}");
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/jarsigner/Main.java
--- a/src/share/classes/sun/security/tools/jarsigner/Main.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/jarsigner/Main.java	Mon Aug 11 08:18:34 2014 -0300
@@ -676,14 +676,13 @@
                             ((man.getAttributes(name) != null) ||
                              (man.getAttributes("./"+name) != null) ||
                              (man.getAttributes("/"+name) != null));
-                        sb.append(
-                          (isSigned ? rb.getString("s") : rb.getString("SPACE")) +
-                          (inManifest ? rb.getString("m") : rb.getString("SPACE")) +
-                          (inStore ? rb.getString("k") : rb.getString("SPACE")) +
-                          (inScope ? rb.getString("i") : rb.getString("SPACE")) +
-                          ((inStoreOrScope & NOT_ALIAS) != 0 ?"X":" ") +
-                          rb.getString("SPACE"));
-                        sb.append("|");
+                        sb.append(isSigned ? rb.getString("s") : rb.getString("SPACE"))
+                                .append(inManifest ? rb.getString("m") : rb.getString("SPACE"))
+                                .append(inStore ? rb.getString("k") : rb.getString("SPACE"))
+                                .append(inScope ? rb.getString("i") : rb.getString("SPACE"))
+                                .append((inStoreOrScope & NOT_ALIAS) != 0 ? 'X' : ' ')
+                                .append(rb.getString("SPACE"));
+                        sb.append('|');
                     }
 
                     // When -certs provided, display info has extra empty
@@ -704,11 +703,13 @@
                         // Print no info for unsigned entries when -verbose:all,
                         // to be consistent with old behavior.
                         if (signatureRelated(name)) {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Signature.related.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(
+                            		rb.getString(".Signature.related.entries."))
+                            		.append("\n\n");
                         } else {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Unsigned.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(
+                            		rb.getString(".Unsigned.entries."))
+                            		.append("\n\n");
                         }
                     }
 
@@ -1605,8 +1606,8 @@
                 // No more warning, we alreay have hasExpiredCert or notYetValidCert
             } else {
                 chainNotValidated = true;
-                sb.append(tab + rb.getString(".CertPath.not.validated.") +
-                        e.getLocalizedMessage() + "]\n");   // TODO
+                sb.append(tab).append(rb.getString(".CertPath.not.validated."))
+                        .append(e.getLocalizedMessage()).append("]\n");   // TODO
             }
         }
         String result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/policytool/PolicyTool.java
--- a/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Mon Aug 11 08:18:34 2014 -0300
@@ -980,8 +980,9 @@
                                 grantEntry.principals.listIterator();
             while (list.hasNext()) {
                 PolicyParser.PrincipalEntry pppe = list.next();
-                sb.append(" Principal " + pppe.getDisplayClass() + " " +
-                    pppe.getDisplayName(true));
+                sb.append(" Principal ").append(pppe.getDisplayClass())
+                        .append(' ')
+                        .append(pppe.getDisplayName(true));
                 if (list.hasNext()) sb.append(", ");
             }
             result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/AVA.java
--- a/src/share/classes/sun/security/x509/AVA.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/AVA.java	Mon Aug 11 08:18:34 2014 -0300
@@ -1062,7 +1062,7 @@
             } else {
 
                 boolean quoteNeeded = false;
-                StringBuilder sbuffer = new StringBuilder();
+                StringBuilder sb = new StringBuilder();
                 boolean previousWhite = false;
                 final String escapees = ",+=\n<>#;\\\"";
 
@@ -1079,7 +1079,7 @@
                 for (int i = 0; i < length; i++) {
                     char c = valStr.charAt(i);
                     if (alreadyQuoted && (i == 0 || i == length - 1)) {
-                        sbuffer.append(c);
+                        sb.append(c);
                         continue;
                     }
                     if (DerValue.isPrintableStringChar(c) ||
@@ -1096,7 +1096,7 @@
                         if (!(c == ' ' || c == '\n')) {
                             // escape '"' and '\'
                             if (c == '"' || c == '\\') {
-                                sbuffer.append('\\');
+                                sb.append('\\');
                             }
                             previousWhite = false;
                         } else {
@@ -1106,7 +1106,7 @@
                             previousWhite = true;
                         }
 
-                        sbuffer.append(c);
+                        sb.append(c);
 
                     } else if (debug != null && Debug.isOn("ava")) {
 
@@ -1119,26 +1119,26 @@
                         byte[] valueBytes =
                                 Character.toString(c).getBytes("UTF8");
                         for (int j = 0; j < valueBytes.length; j++) {
-                            sbuffer.append('\\');
+                            sb.append('\\');
                             char hexChar = Character.forDigit
                                         (0xF & (valueBytes[j] >>> 4), 16);
-                            sbuffer.append(Character.toUpperCase(hexChar));
+                            sb.append(Character.toUpperCase(hexChar));
                             hexChar = Character.forDigit
                                         (0xF & (valueBytes[j]), 16);
-                            sbuffer.append(Character.toUpperCase(hexChar));
+                            sb.append(Character.toUpperCase(hexChar));
                         }
                     } else {
 
                         // append non-printable/non-escaped char
 
                         previousWhite = false;
-                        sbuffer.append(c);
+                        sb.append(c);
                     }
                 }
 
                 // quote if trailing whitespace
-                if (sbuffer.length() > 0) {
-                    char trailChar = sbuffer.charAt(sbuffer.length() - 1);
+                if (sb.length() > 0) {
+                    char trailChar = sb.charAt(sb.length() - 1);
                     if (trailChar == ' ' || trailChar == '\n') {
                         quoteNeeded = true;
                     }
@@ -1147,9 +1147,9 @@
                 // Emit the string ... quote it if needed
                 // if string is already quoted, don't re-quote
                 if (!alreadyQuoted && quoteNeeded) {
-                    retval.append("\"" + sbuffer.toString() + "\"");
+                    retval.append('"').append(sb.toString()).append('"');
                 } else {
-                    retval.append(sbuffer.toString());
+                    retval.append(sb.toString());
                 }
             }
         } catch (IOException e) {
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPoint.java
--- a/src/share/classes/sun/security/x509/DistributionPoint.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPoint.java	Mon Aug 11 08:18:34 2014 -0300
@@ -381,22 +381,22 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPoint:\n     " + fullName + "\n");
+            sb.append("DistributionPoint:\n     ").append(fullName).append('\n');
         }
         if (relativeName != null) {
-            sb.append("DistributionPoint:\n     " + relativeName + "\n");
+            sb.append("DistributionPoint:\n     ").append(relativeName).append('\n');
         }
 
         if (reasonFlags != null) {
             sb.append("   ReasonFlags:\n");
             for (int i = 0; i < reasonFlags.length; i++) {
                 if (reasonFlags[i]) {
-                    sb.append("    " + reasonToString(i) + "\n");
+                    sb.append("    ").append(reasonToString(i)).append('\n');
                 }
             }
         }
         if (crlIssuer != null) {
-            sb.append("   CRLIssuer:" + crlIssuer + "\n");
+            sb.append("   CRLIssuer:").append(crlIssuer).append('\n');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPointName.java
--- a/src/share/classes/sun/security/x509/DistributionPointName.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPointName.java	Mon Aug 11 08:18:34 2014 -0300
@@ -231,10 +231,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPointName:\n     " + fullName + "\n");
+            sb.append("DistributionPointName:\n     ").append(fullName).append('\n');
 
         } else {
-            sb.append("DistributionPointName:\n     " + relativeName + "\n");
+            sb.append("DistributionPointName:\n     ").append(relativeName).append('\n');
         }
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/PolicyInformation.java
--- a/src/share/classes/sun/security/x509/PolicyInformation.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/PolicyInformation.java	Mon Aug 11 08:18:34 2014 -0300
@@ -258,9 +258,9 @@
      * Return a printable representation of the PolicyInformation.
      */
     public String toString() {
-        StringBuilder s = new StringBuilder("  [" + policyIdentifier.toString());
-        s.append(policyQualifiers + "  ]\n");
-        return s.toString();
+        StringBuilder sb = new StringBuilder("  [" + policyIdentifier.toString());
+        sb.append(policyQualifiers).append("  ]\n");
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLEntryImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Mon Aug 11 08:18:34 2014 -0300
@@ -292,17 +292,17 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append(serialNumber.toString());
-        sb.append("  On: " + revocationDate.toString());
+        sb.append("  On: ").append(revocationDate.toString());
         if (certIssuer != null) {
-            sb.append("\n    Certificate issuer: " + certIssuer);
+            sb.append("\n    Certificate issuer: ").append(certIssuer);
         }
         if (extensions != null) {
             Collection<Extension> allEntryExts = extensions.getAllExtensions();
             Extension[] exts = allEntryExts.toArray(new Extension[0]);
 
-            sb.append("\n    CRL Entry Extensions: " + exts.length);
+            sb.append("\n    CRL Entry Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n    [" + (i+1) + "]: ");
+                sb.append("\n    [").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -313,9 +313,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLImpl.java	Mon Aug 11 08:18:34 2014 -0300
@@ -537,31 +537,32 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("X.509 CRL v" + (version+1) + "\n");
+        sb.append("X.509 CRL v").append(version + 1).append('\n');
         if (sigAlgId != null)
-            sb.append("Signature Algorithm: " + sigAlgId.toString() +
-                  ", OID=" + (sigAlgId.getOID()).toString() + "\n");
+            sb.append("Signature Algorithm: ").append(sigAlgId.toString())
+                    .append(", OID=")
+                    .append((sigAlgId.getOID()).toString()).append('\n');
         if (issuer != null)
-            sb.append("Issuer: " + issuer.toString() + "\n");
+            sb.append("Issuer: ").append(issuer.toString()).append('\n');
         if (thisUpdate != null)
-            sb.append("\nThis Update: " + thisUpdate.toString() + "\n");
+            sb.append("\nThis Update: ").append(thisUpdate.toString()).append('\n');
         if (nextUpdate != null)
-            sb.append("Next Update: " + nextUpdate.toString() + "\n");
+            sb.append("Next Update: ").append(nextUpdate.toString()).append('\n');
         if (revokedList.isEmpty())
             sb.append("\nNO certificates have been revoked\n");
         else {
-            sb.append("\nRevoked Certificates: " + revokedList.size());
+            sb.append("\nRevoked Certificates: ").append(revokedList.size());
             int i = 1;
             for (X509CRLEntry entry: revokedList) {
-                sb.append("\n[" + i++ + "] " + entry.toString());
+                sb.append("\n[").append(i++).append("] ").append(entry.toString());
             }
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Object[] objs = allExts.toArray();
-            sb.append("\nCRL Extensions: " + objs.length);
+            sb.append("\nCRL Extensions: ").append(objs.length);
             for (int i = 0; i < objs.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = (Extension)objs[i];
                 try {
                    if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -572,9 +573,8 @@
                            out.putOctetString(extValue);
                            extValue = out.toByteArray();
                            HexDumpEncoder enc = new HexDumpEncoder();
-                           sb.append("Extension unknown: "
-                                     + "DER encoded OCTET string =\n"
-                                     + enc.encodeBuffer(extValue) + "\n");
+                           sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                   .append(enc.encodeBuffer(extValue)).append('\n');
                       }
                    } else
                        sb.append(ext.toString()); // sub-class exists
@@ -585,8 +585,7 @@
         }
         if (signature != null) {
             HexDumpEncoder encoder = new HexDumpEncoder();
-            sb.append("\nSignature:\n" + encoder.encodeBuffer(signature)
-                      + "\n");
+            sb.append("\nSignature:\n").append(encoder.encodeBuffer(signature)).append('\n');
         } else
             sb.append("NOT signed yet\n");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertImpl.java
--- a/src/share/classes/sun/security/x509/X509CertImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertImpl.java	Mon Aug 11 08:18:34 2014 -0300
@@ -802,11 +802,11 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append(info.toString() + "\n");
-        sb.append("  Algorithm: [" + algId.toString() + "]\n");
+        sb.append(info.toString()).append('\n');
+        sb.append("  Algorithm: [").append(algId.toString()).append("]\n");
 
         HexDumpEncoder encoder = new HexDumpEncoder();
-        sb.append("  Signature:\n" + encoder.encodeBuffer(signature));
+        sb.append("  Signature:\n").append(encoder.encodeBuffer(signature));
         sb.append("\n]");
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertInfo.java
--- a/src/share/classes/sun/security/x509/X509CertInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertInfo.java	Mon Aug 11 08:18:34 2014 -0300
@@ -298,27 +298,27 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append("  " + version.toString() + "\n");
-        sb.append("  Subject: " + subject.toString() + "\n");
-        sb.append("  Signature Algorithm: " + algId.toString() + "\n");
-        sb.append("  Key:  " + pubKey.toString() + "\n");
-        sb.append("  " + interval.toString() + "\n");
-        sb.append("  Issuer: " + issuer.toString() + "\n");
-        sb.append("  " + serialNum.toString() + "\n");
+        sb.append("  ").append(version.toString()).append('\n');
+        sb.append("  Subject: ").append(subject.toString()).append('\n');
+        sb.append("  Signature Algorithm: ").append(algId.toString()).append('\n');
+        sb.append("  Key:  ").append(pubKey.toString()).append('\n');
+        sb.append("  ").append(interval.toString()).append('\n');
+        sb.append("  Issuer: ").append(issuer.toString()).append('\n');
+        sb.append("  ").append(serialNum.toString()).append('\n');
 
         // optional v2, v3 extras
         if (issuerUniqueId != null) {
-            sb.append("  Issuer Id:\n" + issuerUniqueId.toString() + "\n");
+            sb.append("  Issuer Id:\n").append(issuerUniqueId.toString()).append('\n');
         }
         if (subjectUniqueId != null) {
-            sb.append("  Subject Id:\n" + subjectUniqueId.toString() + "\n");
+            sb.append("  Subject Id:\n").append(subjectUniqueId.toString()).append('\n');
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Extension[] exts = allExts.toArray(new Extension[0]);
-            sb.append("\nCertificate Extensions: " + exts.length);
+            sb.append("\nCertificate Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -329,9 +329,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
@@ -341,10 +340,10 @@
             }
             Map<String,Extension> invalid = extensions.getUnparseableExtensions();
             if (invalid.isEmpty() == false) {
-                sb.append("\nUnparseable certificate extensions: " + invalid.size());
+                sb.append("\nUnparseable certificate extensions: ").append(invalid.size());
                 int i = 1;
                 for (Extension ext : invalid.values()) {
-                    sb.append("\n[" + (i++) + "]: ");
+                    sb.append("\n[").append(i++).append("]: ");
                     sb.append(ext);
                 }
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
--- a/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Mon Aug 11 08:18:33 2014 -0300
@@ -465,10 +465,10 @@
 
     private static void appendIfLiteralAddress(String addr, StringBuffer sb) {
         if (IPAddressUtil.isIPv4LiteralAddress(addr)) {
-            sb.append("dns://" + addr + " ");
+            sb.append("dns://").append(addr).append(' ');
         } else {
             if (IPAddressUtil.isIPv6LiteralAddress(addr)) {
-                sb.append("dns://[" + addr + "] ");
+                sb.append("dns://[").append(addr).append("] ");
             }
         }
     }
diff -r dde9f5cfde5f src/share/classes/sun/net/www/HeaderParser.java
--- a/src/share/classes/sun/net/www/HeaderParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/HeaderParser.java	Mon Aug 11 08:18:33 2014 -0300
@@ -220,21 +220,23 @@
 
     public String toString () {
         Iterator<String> k = keys();
-        StringBuffer sbuf = new StringBuffer();
-        sbuf.append ("{size="+asize+" nkeys="+nkeys+" ");
+        StringBuilder sb = new StringBuilder();
+		sb.append("{size=").append(asize).append(" nkeys=").append(nkeys)
+				.append(' ');
         for (int i=0; k.hasNext(); i++) {
             String key = k.next();
             String val = findValue (i);
             if (val != null && "".equals (val)) {
                 val = null;
             }
-            sbuf.append (" {"+key+(val==null?"":","+val)+"}");
+			sb.append(" {").append(key).append(val == null ? "" : "," + val)
+					.append('}');
             if (k.hasNext()) {
-                sbuf.append (",");
+                sb.append (',');
             }
         }
-        sbuf.append (" }");
-        return new String (sbuf);
+        sb.append (" }");
+        return new String (sb);
     }
 
     public int findInt(String k, int Default) {
diff -r dde9f5cfde5f src/share/classes/sun/net/www/MimeEntry.java
--- a/src/share/classes/sun/net/www/MimeEntry.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/MimeEntry.java	Mon Aug 11 08:18:33 2014 -0300
@@ -288,7 +288,7 @@
 
         int action = getAction();
         if (action != MimeEntry.UNKNOWN) {
-            sb.append("action=" + actionKeywords[action]);
+            sb.append("action=").append(actionKeywords[action]);
             needSeparator = true;
         }
 
@@ -297,7 +297,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("application=" + command);
+            sb.append("application=").append(command);
             needSeparator = true;
         }
 
@@ -305,7 +305,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("icon=" + getImageFileName());
+            sb.append("icon=").append(getImageFileName());
             needSeparator = true;
         }
 
@@ -314,7 +314,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("file_extensions=" + extensions);
+            sb.append("file_extensions=").append(extensions);
             needSeparator = true;
         }
 
@@ -323,7 +323,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("description=" + description);
+            sb.append("description=").append(description);
         }
 
         return sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/management/Agent.java
--- a/src/share/classes/sun/management/Agent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/Agent.java	Mon Aug 11 08:18:33 2014 -0300
@@ -502,7 +502,7 @@
         } else {
             StringBuilder message = new StringBuilder(params[0]);
             for (int i = 1; i < params.length; i++) {
-                message.append(" " + params[i]);
+                message.append(' ').append(params[i]);
             }
             error(key, message.toString());
         }
diff -r dde9f5cfde5f src/share/classes/sun/management/MappedMXBeanType.java
--- a/src/share/classes/sun/management/MappedMXBeanType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/MappedMXBeanType.java	Mon Aug 11 08:18:33 2014 -0300
@@ -289,7 +289,7 @@
             if (et.isPrimitive()) {
                 className = new StringBuilder(c.getName());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
@@ -385,7 +385,7 @@
             if (elementType instanceof Class && ((Class) elementType).isPrimitive()) {
                 className = new StringBuilder(gat.toString());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/launcher/LauncherHelper.java
--- a/src/share/classes/sun/launcher/LauncherHelper.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/launcher/LauncherHelper.java	Mon Aug 11 08:18:33 2014 -0300
@@ -369,10 +369,9 @@
     static void appendVmErgoMessage(boolean isServerClass, String vm) {
         outBuf = outBuf.append(getLocalizedMessage("java.launcher.ergo.message1",
                 vm));
-        outBuf = (isServerClass)
-             ? outBuf.append(",\n" +
-                getLocalizedMessage("java.launcher.ergo.message2") + "\n\n")
-             : outBuf.append(".\n\n");
+		outBuf = (isServerClass) ? outBuf.append(",\n")
+				.append(getLocalizedMessage("java.launcher.ergo.message2"))
+				.append("\n\n") : outBuf.append(".\n\n");
     }
 
     /**
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/font/AttributeValues.java
--- a/src/share/classes/sun/font/AttributeValues.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/AttributeValues.java	Mon Aug 11 08:18:33 2014 -0300
@@ -542,7 +542,7 @@
                 }
             }
         }
-        b.append("[btx=" + baselineTransform + ", ctx=" + charTransform + "]");
+        b.append("[btx=").append(baselineTransform).append(", ctx=").append(charTransform).append(']');
         b.append('}');
         return b.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/font/Decoration.java
--- a/src/share/classes/sun/font/Decoration.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/Decoration.java	Mon Aug 11 08:18:33 2014 -0300
@@ -431,12 +431,12 @@
             StringBuilder sb = new StringBuilder();
             sb.append(super.toString());
             sb.append("[");
-            if (fgPaint != null) sb.append("fgPaint: " + fgPaint);
-            if (bgPaint != null) sb.append(" bgPaint: " + bgPaint);
+            if (fgPaint != null) sb.append("fgPaint: ").append(fgPaint);
+            if (bgPaint != null) sb.append(" bgPaint: ").append(bgPaint);
             if (swapColors) sb.append(" swapColors: true");
             if (strikethrough) sb.append(" strikethrough: true");
-            if (stdUnderline != null) sb.append(" stdUnderline: " + stdUnderline);
-            if (imUnderline != null) sb.append(" imUnderline: " + imUnderline);
+            if (stdUnderline != null) sb.append(" stdUnderline: ").append(stdUnderline);
+            if (imUnderline != null) sb.append(" imUnderline: ").append(imUnderline);
             sb.append("]");
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/font/StandardGlyphVector.java
--- a/src/share/classes/sun/font/StandardGlyphVector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/StandardGlyphVector.java	Mon Aug 11 08:18:33 2014 -0300
@@ -1894,9 +1894,9 @@
             }
         }
         catch(Exception e) {
-            buf.append(" " + e.getMessage());
+            buf.append(' ').append(e.getMessage());
         }
-        buf.append("}");
+        buf.append('}');
 
         return buf;
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/swing/GroupLayout.java
--- a/src/share/classes/javax/swing/GroupLayout.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/GroupLayout.java	Mon Aug 11 08:18:33 2014 -0300
@@ -1239,15 +1239,14 @@
             padding = ", userCreated=" + paddingSpring.getUserCreated() +
                     ", matches=" + paddingSpring.getMatchDescription();
         }
-        buffer.append(indent + spring.getClass().getName() + " " +
-                Integer.toHexString(spring.hashCode()) + " " +
-                origin +
-                ", size=" + spring.getSize() +
-                ", alignment=" + spring.getAlignment() +
-                " prefs=[" + spring.getMinimumSize(axis) +
-                " " + spring.getPreferredSize(axis) +
-                " " + spring.getMaximumSize(axis) +
-                padding + "]\n");
+		buffer.append(indent).append(spring.getClass().getName()).append(' ')
+				.append(Integer.toHexString(spring.hashCode())).append(' ')
+				.append(origin).append(", size=").append(spring.getSize())
+				.append(", alignment=").append(spring.getAlignment())
+				.append(" prefs=[").append(spring.getMinimumSize(axis))
+				.append(' ').append(spring.getPreferredSize(axis)).append(' ')
+				.append(spring.getMaximumSize(axis)).append(padding)
+				.append("]\n");
         if (spring instanceof Group) {
             List<Spring> springs = ((Group)spring).springs;
             indent += "  ";
diff -r dde9f5cfde5f src/share/classes/javax/swing/JColorChooser.java
--- a/src/share/classes/javax/swing/JColorChooser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/JColorChooser.java	Mon Aug 11 08:18:33 2014 -0300
@@ -545,8 +545,7 @@
     protected String paramString() {
         StringBuilder chooserPanelsString = new StringBuilder("");
         for (int i=0; i<chooserPanels.length; i++) {
-            chooserPanelsString.append("[" + chooserPanels[i].toString()
-                                       + "]");
+            chooserPanelsString.append('[').append(chooserPanels[i].toString()).append(']');
         }
         String previewPanelString = (previewPanel != null ?
                                      previewPanel.toString() : "");
diff -r dde9f5cfde5f src/share/classes/javax/swing/MultiUIDefaults.java
--- a/src/share/classes/javax/swing/MultiUIDefaults.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/MultiUIDefaults.java	Mon Aug 11 08:18:33 2014 -0300
@@ -195,13 +195,13 @@
         Enumeration<?> keys = keys();
         while (keys.hasMoreElements()) {
             Object key = keys.nextElement();
-            sb.append(key + "=" + get(key) + ", ");
+            sb.append(key).append('=').append(get(key)).append(", ");
         }
         int length = sb.length();
         if (length > 1) {
             sb.delete(length-2, length);
         }
-        sb.append("}");
+        sb.append('}');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/javax/swing/RepaintManager.java
--- a/src/share/classes/javax/swing/RepaintManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/RepaintManager.java	Mon Aug 11 08:18:33 2014 -0300
@@ -990,10 +990,7 @@
      * @return a String representation of this object
      */
     public synchronized String toString() {
-        StringBuilder sb = new StringBuilder();
-        if(dirtyComponents != null)
-            sb.append("" + dirtyComponents);
-        return sb.toString();
+		return dirtyComponents != null ? dirtyComponents.toString() : "";
     }
 
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/event/TreeModelEvent.java
--- a/src/share/classes/javax/swing/event/TreeModelEvent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/event/TreeModelEvent.java	Mon Aug 11 08:18:33 2014 -0300
@@ -294,21 +294,20 @@
     public String toString() {
         StringBuilder   sb = new StringBuilder();
 
-        sb.append(getClass().getName() + " " +
-                  Integer.toString(hashCode()));
+        sb.append(getClass().getName()).append(' ').append(Integer.toString(hashCode()));
         if(path != null)
-            sb.append(" path " + path);
+            sb.append(" path ").append(path);
         if(childIndices != null) {
             sb.append(" indices [ ");
             for(int counter = 0; counter < childIndices.length; counter++)
-                sb.append(Integer.toString(childIndices[counter])+ " ");
-            sb.append("]");
+                sb.append(Integer.toString(childIndices[counter])).append(' ');
+            sb.append(']');
         }
         if(children != null) {
             sb.append(" children [ ");
             for(int counter = 0; counter < children.length; counter++)
-                sb.append(children[counter] + " ");
-            sb.append("]");
+                sb.append(children[counter]).append(' ');
+            sb.append(']');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Mon Aug 11 08:18:33 2014 -0300
@@ -1330,8 +1330,8 @@
 
             for (Object obj : values) {
                 String val = ((obj == null) ? "" : obj.toString());
-                plainBuf.append(val + "\n");
-                htmlBuf.append("  <li>" + val + "\n");
+                plainBuf.append(val).append('\n');
+                htmlBuf.append("  <li>").append(val).append('\n');
             }
 
             // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicListUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Mon Aug 11 08:18:33 2014 -0300
@@ -2948,8 +2948,8 @@
                 for (int i = 0; i < values.length; i++) {
                     Object obj = values[i];
                     String val = ((obj == null) ? "" : obj.toString());
-                    plainStr.append(val + "\n");
-                    htmlStr.append("  <li>" + val + "\n");
+                    plainStr.append(val).append('\n');
+                    htmlStr.append("  <li>").append(val).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTableUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Mon Aug 11 08:18:33 2014 -0300
@@ -2230,11 +2230,11 @@
                     for (int col = 0; col < cols.length; col++) {
                         Object obj = table.getValueAt(rows[row], cols[col]);
                         String val = ((obj == null) ? "" : obj.toString());
-                        plainStr.append(val + "\t");
-                        htmlStr.append("  <td>" + val + "</td>\n");
+                        plainStr.append(val).append('\t');
+                        htmlStr.append("  <td>").append(val).append("</td>\n");
                     }
                     // we want a newline at the end of each line and not a tab
-                    plainStr.deleteCharAt(plainStr.length() - 1).append("\n");
+                    plainStr.deleteCharAt(plainStr.length() - 1).append('\t');
                     htmlStr.append("</tr>\n");
                 }
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Mon Aug 11 08:18:33 2014 -0300
@@ -3618,8 +3618,8 @@
                     boolean leaf = model.isLeaf(node);
                     String label = getDisplayString(path, true, leaf);
 
-                    plainStr.append(label + "\n");
-                    htmlStr.append("  <li>" + label + "\n");
+                    plainStr.append(label).append('\n');
+                    htmlStr.append("  <li>").append(label).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
--- a/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Mon Aug 11 08:18:33 2014 -0300
@@ -1160,15 +1160,15 @@
             rows = rowMapper.getRowsForPaths(selection);
         else
             rows = null;
-        sb.append(getClass().getName() + " " + hashCode() + " [ ");
+        sb.append(getClass().getName()).append(' ').append(hashCode()).append(" [ ");
         for(int counter = 0; counter < selCount; counter++) {
             if(rows != null)
-                sb.append(selection[counter].toString() + "@" +
-                          Integer.toString(rows[counter])+ " ");
+                sb.append(selection[counter].toString()).append('@')
+                        .append(Integer.toString(rows[counter])).append(' ');
             else
-                sb.append(selection[counter].toString() + " ");
+                sb.append(selection[counter].toString()).append(' ');
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/AudioFileFormat.java
--- a/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Mon Aug 11 08:18:33 2014 -0300
@@ -272,26 +272,25 @@
     @Override
     public String toString() {
 
-        StringBuffer buf = new StringBuffer();
+        StringBuffer sb = new StringBuffer();
 
         //$$fb2002-11-01: fix for 4672864: AudioFileFormat.toString() throws unexpected NullPointerException
         if (type != null) {
-            buf.append(type.toString() + " (." + type.getExtension() + ") file");
+            sb.append(type.toString()).append(" (.").append(type.getExtension()).append(") file");
         } else {
-            buf.append("unknown file format");
+            sb.append("unknown file format");
         }
 
         if (byteLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", byte length: " + byteLength);
+            sb.append(", byte length: ").append(byteLength);
         }
 
-        buf.append(", data format: " + format);
+        sb.append(", data format: ").append(format);
 
         if (frameLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", frame length: " + frameLength);
+            sb.append(", frame length: ").append(frameLength);
         }
-
-        return new String(buf);
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/DataLine.java
--- a/src/share/classes/javax/sound/sampled/DataLine.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/DataLine.java	Mon Aug 11 08:18:33 2014 -0300
@@ -473,17 +473,21 @@
             StringBuilder sb = new StringBuilder();
 
             if ( (formats.length == 1) && (formats[0] != null) ) {
-                sb.append(" supporting format " + formats[0]);
+                sb.append(" supporting format ").append(formats[0]);
             } else if (getFormats().length > 1) {
-                sb.append(" supporting " + getFormats().length + " audio formats");
+				sb.append(" supporting ").append(getFormats().length)
+						.append(" audio formats");
             }
 
             if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (maxBufferSize != AudioSystem.NOT_SPECIFIED) ) {
-                sb.append(", and buffers of " + minBufferSize + " to " + maxBufferSize + " bytes");
+				sb.append(", and buffers of ").append(minBufferSize)
+						.append(" to ").append(maxBufferSize).append(" bytes");
             } else if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (minBufferSize > 0) ) {
-                sb.append(", and buffers of at least " + minBufferSize + " bytes");
+				sb.append(", and buffers of at least ").append(minBufferSize)
+						.append(" bytes");
             } else if (maxBufferSize != AudioSystem.NOT_SPECIFIED) {
-                sb.append(", and buffers of up to " + minBufferSize + " bytes");
+				sb.append(", and buffers of up to ").append(minBufferSize)
+						.append(" bytes");
             }
 
             return new String(super.toString() + sb);
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
--- a/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Mon Aug 11 08:18:33 2014 -0300
@@ -651,8 +651,7 @@
         StringBuilder caddrString = new StringBuilder();
         if (clientAddresses != null) {
             for (int i = 0; i < clientAddresses.length; i++) {
-                caddrString.append("clientAddresses[" + i + "] = " +
-                        clientAddresses[i].toString());
+                caddrString.append("clientAddresses[").append(i).append("] = ").append(clientAddresses[i].toString());
             }
         }
         return ("Ticket (hex) = " + "\n" +
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/naming/BinaryRefAddr.java
--- a/src/share/classes/javax/naming/BinaryRefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/BinaryRefAddr.java	Mon Aug 11 08:18:33 2014 -0300
@@ -165,11 +165,11 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Address Type: " + addrType + "\n");
-
+        StringBuilder str = new StringBuilder();
+        str.append("Address Type: ").append(addrType).append('\n');
         str.append("AddressContents: ");
         for (int i = 0; i<buf.length && i < 32; i++) {
-            str.append(Integer.toHexString(buf[i]) +" ");
+            str.append(Integer.toHexString(buf[i])).append(' ');
         }
         if (buf.length >= 32)
             str.append(" ...\n");
diff -r dde9f5cfde5f src/share/classes/javax/naming/NameImpl.java
--- a/src/share/classes/javax/naming/NameImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/NameImpl.java	Mon Aug 11 08:18:33 2014 -0300
@@ -170,7 +170,7 @@
                 endQuote = one ? syntaxEndQuote1 : syntaxEndQuote2;
 
                 i += syntaxTypevalSeparator.length();
-                answer.append(syntaxTypevalSeparator+beginQuote); // add back
+                answer.append(syntaxTypevalSeparator).append(beginQuote); // add back
 
                 // consume string until matching quote
                 for (i += beginQuote.length();
diff -r dde9f5cfde5f src/share/classes/javax/naming/RefAddr.java
--- a/src/share/classes/javax/naming/RefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/RefAddr.java	Mon Aug 11 08:18:33 2014 -0300
@@ -139,9 +139,9 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Type: " + addrType + "\n");
-
-        str.append("Content: " + getContent() + "\n");
+        StringBuilder str = new StringBuilder();
+        str.append("Type: ").append(addrType).append('\n');
+        str.append("Content: ").append(getContent()).append('\n');
         return (str.toString());
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/crypto/CryptoPermission.java
--- a/src/share/classes/javax/crypto/CryptoPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/crypto/CryptoPermission.java	Mon Aug 11 08:18:32 2014 -0300
@@ -369,22 +369,24 @@
      * @return information about this CryptoPermission.
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder(100);
-        buf.append("(CryptoPermission " + alg + " " + maxKeySize);
+        StringBuilder sb = new StringBuilder(100);
+		sb.append("(CryptoPermission ").append(alg).append(' ')
+				.append(maxKeySize);
         if (algParamSpec != null) {
             if (algParamSpec instanceof RC2ParameterSpec) {
-                buf.append(" , effective " +
-                    ((RC2ParameterSpec)algParamSpec).getEffectiveKeyBits());
+				sb.append(" , effective ")
+						.append(((RC2ParameterSpec) algParamSpec)
+								.getEffectiveKeyBits());
             } else if (algParamSpec instanceof RC5ParameterSpec) {
-                buf.append(" , rounds " +
-                    ((RC5ParameterSpec)algParamSpec).getRounds());
+				sb.append(" , rounds ").append(
+						((RC5ParameterSpec) algParamSpec).getRounds());
             }
         }
         if (exemptionMechanism != null) { // OPTIONAL
-            buf.append(" " + exemptionMechanism);
+            sb.append(' ').append(exemptionMechanism);
         }
-        buf.append(")");
-        return buf.toString();
+        sb.append(')');
+        return sb.toString();
     }
 
     private boolean impliesExemptionMechanism(String exemptionMechanism) {
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/management/MBeanPermission.java
--- a/src/share/classes/javax/management/MBeanPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/MBeanPermission.java	Mon Aug 11 08:18:32 2014 -0300
@@ -455,11 +455,11 @@
         name.append(className);
         if (member == null)
             member = "-";
-        name.append("#" + member);
+        name.append('#').append(member);
         if (objectName == null)
             name.append("[-]");
         else
-            name.append("[").append(objectName.getCanonicalName()).append("]");
+            name.append('[').append(objectName.getCanonicalName()).append(']');
 
         /* In the interests of legibility for Permission.toString(), we
            transform the empty string into "*".  */
diff -r dde9f5cfde5f src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
--- a/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Mon Aug 11 08:18:32 2014 -0300
@@ -716,15 +716,14 @@
         }
 
         retStr.append("\nMBeanInfo for ModelMBean is:");
-        retStr.append("\nCLASSNAME: \t"+ info.getClassName());
-        retStr.append("\nDESCRIPTION: \t"+ info.getDescription());
+        retStr.append("\nCLASSNAME: \t").append(info.getClassName());
+        retStr.append("\nDESCRIPTION: \t").append(info.getDescription());
 
 
         try {
-            retStr.append("\nMBEAN DESCRIPTOR: \t"+
-                          info.getMBeanDescriptor());
+            retStr.append("\nMBEAN DESCRIPTOR: \t").append(info.getMBeanDescriptor());
         } catch (Exception e) {
-            retStr.append("\nMBEAN DESCRIPTOR: \t" + " is invalid");
+            retStr.append("\nMBEAN DESCRIPTOR: \t  is invalid");
         }
 
         retStr.append("\nATTRIBUTES");
@@ -734,13 +733,12 @@
             for (int i=0; i<attrInfo.length; i++) {
                 final ModelMBeanAttributeInfo attInfo =
                     (ModelMBeanAttributeInfo)attrInfo[i];
-                retStr.append(" ** NAME: \t"+ attInfo.getName());
-                retStr.append("    DESCR: \t"+ attInfo.getDescription());
-                retStr.append("    TYPE: \t"+ attInfo.getType() +
-                              "    READ: \t"+ attInfo.isReadable() +
-                              "    WRITE: \t"+ attInfo.isWritable());
-                retStr.append("    DESCRIPTOR: " +
-                              attInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(attInfo.getName());
+                retStr.append("    DESCR: \t").append(attInfo.getDescription());
+                retStr.append("    TYPE: \t").append(attInfo.getType())
+                        .append("    READ: \t").append(attInfo.isReadable())
+                        .append("    WRITE: \t").append(attInfo.isWritable());
+                retStr.append("    DESCRIPTOR: ").append(attInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No attributes **");
@@ -752,14 +750,12 @@
             for (int i=0; i<constrInfo.length; i++) {
                 final ModelMBeanConstructorInfo ctorInfo =
                     (ModelMBeanConstructorInfo)constrInfo[i];
-                retStr.append(" ** NAME: \t"+ ctorInfo.getName());
-                retStr.append("    DESCR: \t"+
-                              ctorInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              ctorInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              ctorInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(ctorInfo.getName());
+                retStr.append("    DESCR: \t").append(ctorInfo.getDescription());
+                retStr.append("    PARAM: \t").append(ctorInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ")
+                        .append(ctorInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No Constructors **");
@@ -771,13 +767,11 @@
             for (int i=0; i<opsInfo.length; i++) {
                 final ModelMBeanOperationInfo operInfo =
                     (ModelMBeanOperationInfo)opsInfo[i];
-                retStr.append(" ** NAME: \t"+ operInfo.getName());
-                retStr.append("    DESCR: \t"+ operInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              operInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              operInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(operInfo.getName());
+                retStr.append("    DESCR: \t").append(operInfo.getDescription());
+                retStr.append("    PARAM: \t").append(operInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ").append(operInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No operations ** ");
@@ -790,10 +784,9 @@
             for (int i=0; i<notifInfo.length; i++) {
                 final ModelMBeanNotificationInfo nInfo =
                     (ModelMBeanNotificationInfo)notifInfo[i];
-                retStr.append(" ** NAME: \t"+ nInfo.getName());
-                retStr.append("    DESCR: \t"+ nInfo.getDescription());
-                retStr.append("    DESCRIPTOR: " +
-                              nInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(nInfo.getName());
+                retStr.append("    DESCR: \t").append(nInfo.getDescription());
+                retStr.append("    DESCRIPTOR: ").append(nInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No notifications **");
diff -r dde9f5cfde5f src/share/classes/javax/management/openmbean/CompositeType.java
--- a/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/openmbean/CompositeType.java	Mon Aug 11 08:18:32 2014 -0300
@@ -463,7 +463,7 @@
                 result.append("(itemName=");
                 result.append(key);
                 result.append(",itemType=");
-                result.append(nameToType.get(key).toString() +")");
+                result.append(nameToType.get(key).toString()).append(')');
                 i++;
             }
             result.append("))");
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/Role.java
--- a/src/share/classes/javax/management/relation/Role.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/Role.java	Mon Aug 11 08:18:32 2014 -0300
@@ -227,7 +227,7 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role name: " + name + "; role value: ");
+        result.append("role name: ").append(name).append("; role value: ");
         for (Iterator<ObjectName> objNameIter = objectNameList.iterator();
              objNameIter.hasNext();) {
             ObjectName currObjName = objNameIter.next();
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleInfo.java
--- a/src/share/classes/javax/management/relation/RoleInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleInfo.java	Mon Aug 11 08:18:32 2014 -0300
@@ -456,13 +456,13 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role info name: " + name);
-        result.append("; isReadable: " + isReadable);
-        result.append("; isWritable: " + isWritable);
-        result.append("; description: " + description);
-        result.append("; minimum degree: " + minDegree);
-        result.append("; maximum degree: " + maxDegree);
-        result.append("; MBean class: " + referencedMBeanClassName);
+        result.append("role info name: ").append(name);
+        result.append("; isReadable: ").append(isReadable);
+        result.append("; isWritable: ").append(isWritable);
+        result.append("; description: ").append(description);
+        result.append("; minimum degree: ").append(minDegree);
+        result.append("; maximum degree: ").append(maxDegree);
+        result.append("; MBean class: ").append(referencedMBeanClassName);
         return result.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleUnresolved.java
--- a/src/share/classes/javax/management/relation/RoleUnresolved.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleUnresolved.java	Mon Aug 11 08:18:32 2014 -0300
@@ -282,7 +282,7 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role name: " + roleName);
+        result.append("role name: ").append(roleName);
         if (roleValue != null) {
             result.append("; value: ");
             for (Iterator<ObjectName> objNameIter = roleValue.iterator();
@@ -294,7 +294,7 @@
                 }
             }
         }
-        result.append("; problem type: " + problemType);
+        result.append("; problem type: ").append(problemType);
         return result.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/util/Scanner.java
--- a/src/share/classes/java/util/Scanner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/Scanner.java	Mon Aug 11 08:18:32 2014 -0300
@@ -1304,20 +1304,20 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.Scanner");
-        sb.append("[delimiters=" + delimPattern + "]");
-        sb.append("[position=" + position + "]");
-        sb.append("[match valid=" + matchValid + "]");
-        sb.append("[need input=" + needInput + "]");
-        sb.append("[source closed=" + sourceClosed + "]");
-        sb.append("[skipped=" + skipped + "]");
-        sb.append("[group separator=" + groupSeparator + "]");
-        sb.append("[decimal separator=" + decimalSeparator + "]");
-        sb.append("[positive prefix=" + positivePrefix + "]");
-        sb.append("[negative prefix=" + negativePrefix + "]");
-        sb.append("[positive suffix=" + positiveSuffix + "]");
-        sb.append("[negative suffix=" + negativeSuffix + "]");
-        sb.append("[NaN string=" + nanString + "]");
-        sb.append("[infinity string=" + infinityString + "]");
+        sb.append("[delimiters=").append(delimPattern).append(']');
+        sb.append("[position=").append(position).append(']');
+        sb.append("[match valid=").append(matchValid).append(']');
+        sb.append("[need input=").append(needInput).append(']');
+        sb.append("[source closed=").append(sourceClosed).append(']');
+        sb.append("[skipped=").append(skipped).append(']');
+        sb.append("[group separator=").append(groupSeparator).append(']');
+        sb.append("[decimal separator=").append(decimalSeparator).append(']');
+        sb.append("[positive prefix=").append(positivePrefix).append(']');
+        sb.append("[negative prefix=").append(negativePrefix).append(']');
+        sb.append("[positive suffix=").append(positiveSuffix).append(']');
+        sb.append("[negative suffix=").append(negativeSuffix).append(']');
+        sb.append("[NaN string=").append(nanString).append(']');
+        sb.append("[infinity string=").append(infinityString).append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Matcher.java
--- a/src/share/classes/java/util/regex/Matcher.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Matcher.java	Mon Aug 11 08:18:32 2014 -0300
@@ -1295,14 +1295,14 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.regex.Matcher");
-        sb.append("[pattern=" + pattern());
+        sb.append("[pattern=").append(pattern());
         sb.append(" region=");
-        sb.append(regionStart() + "," + regionEnd());
+        sb.append(regionStart()).append(',').append(regionEnd());
         sb.append(" lastmatch=");
         if ((first >= 0) && (group() != null)) {
             sb.append(group());
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Pattern.java
--- a/src/share/classes/java/util/regex/Pattern.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Pattern.java	Mon Aug 11 08:18:32 2014 -0300
@@ -1488,10 +1488,10 @@
         for(int x=0; x<perms.length; x++) {
             String next = base + perms[x];
             if (x>0)
-                result.append("|"+next);
+                result.append('|').append(next);
             next = composeOneStep(next);
             if (next != null)
-                result.append("|"+produceEquivalentAlternation(next));
+                result.append('|').append(produceEquivalentAlternation(next));
         }
         return result.toString();
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/text/ChoiceFormat.java
--- a/src/share/classes/java/text/ChoiceFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/text/ChoiceFormat.java	Mon Aug 11 08:18:32 2014 -0300
@@ -272,7 +272,7 @@
             double tryLess = Math.abs(Math.IEEEremainder(less, 1.0d));
 
             if (tryLessOrEqual < tryLess) {
-                result.append(""+choiceLimits[i]);
+                result.append(choiceLimits[i]);
                 result.append('#');
             } else {
                 if (choiceLimits[i] == Double.POSITIVE_INFINITY) {
@@ -280,7 +280,7 @@
                 } else if (choiceLimits[i] == Double.NEGATIVE_INFINITY) {
                     result.append("-\u221E");
                 } else {
-                    result.append(""+less);
+                    result.append(less);
                 }
                 result.append('<');
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSigner.java
--- a/src/share/classes/java/security/CodeSigner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSigner.java	Mon Aug 11 08:18:32 2014 -0300
@@ -156,9 +156,9 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("Signer: " + signerCertPath.getCertificates().get(0));
+        sb.append("Signer: ").append(signerCertPath.getCertificates().get(0));
         if (timestamp != null) {
-            sb.append("timestamp: " + timestamp);
+            sb.append("timestamp: ").append(timestamp);
         }
         sb.append(")");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSource.java
--- a/src/share/classes/java/security/CodeSource.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSource.java	Mon Aug 11 08:18:32 2014 -0300
@@ -468,12 +468,12 @@
 
         if (this.certs != null && this.certs.length > 0) {
             for (int i = 0; i < this.certs.length; i++) {
-                sb.append( " " + this.certs[i]);
+                sb.append(' ').append(this.certs[i]);
             }
 
         } else if (this.signers != null && this.signers.length > 0) {
             for (int i = 0; i < this.signers.length; i++) {
-                sb.append( " " + this.signers[i]);
+                sb.append(' ').append(this.signers[i]);
             }
         } else {
             sb.append(" <no signer certificates>");
diff -r dde9f5cfde5f src/share/classes/java/security/KeyStore.java
--- a/src/share/classes/java/security/KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/KeyStore.java	Mon Aug 11 08:18:32 2014 -0300
@@ -610,8 +610,8 @@
          */
         public String toString() {
             StringBuilder sb = new StringBuilder();
-            sb.append("Private key entry and certificate chain with "
-                + chain.length + " elements:\r\n");
+			sb.append("Private key entry and certificate chain with ")
+					.append(chain.length).append(" elements:\r\n");
             for (Certificate cert : chain) {
                 sb.append(cert);
                 sb.append("\r\n");
diff -r dde9f5cfde5f src/share/classes/java/security/PermissionCollection.java
--- a/src/share/classes/java/security/PermissionCollection.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/PermissionCollection.java	Mon Aug 11 08:18:32 2014 -0300
@@ -179,12 +179,12 @@
     public String toString() {
         Enumeration<Permission> enum_ = elements();
         StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()+" (\n");
+        sb.append(super.toString()).append(" (\n");
         while (enum_.hasMoreElements()) {
             try {
-                sb.append(" ");
+                sb.append(' ');
                 sb.append(enum_.nextElement().toString());
-                sb.append("\n");
+                sb.append('\n');
             } catch (NoSuchElementException e){
                 // ignore
             }
diff -r dde9f5cfde5f src/share/classes/java/security/ProtectionDomain.java
--- a/src/share/classes/java/security/ProtectionDomain.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/ProtectionDomain.java	Mon Aug 11 08:18:32 2014 -0300
@@ -291,9 +291,9 @@
             StringBuilder palBuf = new StringBuilder("(principals ");
 
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                            " \"" + principals[i].getName() +
-                            "\"");
+                palBuf.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append('"');
                 if (i < principals.length-1)
                     palBuf.append(",\n");
                 else
diff -r dde9f5cfde5f src/share/classes/java/security/Timestamp.java
--- a/src/share/classes/java/security/Timestamp.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/Timestamp.java	Mon Aug 11 08:18:32 2014 -0300
@@ -143,10 +143,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("timestamp: " + timestamp);
+        sb.append("timestamp: ").append(timestamp);
         List<? extends Certificate> certs = signerCertPath.getCertificates();
         if (!certs.isEmpty()) {
-            sb.append("TSA: " + certs.get(0));
+            sb.append("TSA: ").append(certs.get(0));
         } else {
             sb.append("TSA: <empty>");
         }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CertPath.java
--- a/src/share/classes/java/security/cert/CertPath.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CertPath.java	Mon Aug 11 08:18:32 2014 -0300
@@ -224,17 +224,16 @@
         Iterator<? extends Certificate> stringIterator =
                                         getCertificates().iterator();
 
-        sb.append("\n" + type + " Cert Path: length = "
-            + getCertificates().size() + ".\n");
+        sb.append('\n').append(type).append(" Cert Path: length = ").append(getCertificates().size()).append(".\n");
         sb.append("[\n");
         int i = 1;
         while (stringIterator.hasNext()) {
-            sb.append("=========================================="
-                + "===============Certificate " + i + " start.\n");
+            sb.append("==========================================" + "===============Certificate ")
+                    .append(i).append(" start.\n");
             Certificate stringCert = stringIterator.next();
             sb.append(stringCert.toString());
-            sb.append("\n========================================"
-                + "=================Certificate " + i + " end.\n\n\n");
+            sb.append("\n========================================" + "=================Certificate ")
+                    .append(i).append(" end.\n\n\n");
             i++;
         }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CollectionCertStoreParameters.java
--- a/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Mon Aug 11 08:18:32 2014 -0300
@@ -134,8 +134,8 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CollectionCertStoreParameters: [\n");
-        sb.append("  collection: " + coll + "\n");
-        sb.append("]");
+        sb.append("  collection: ").append(coll).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/LDAPCertStoreParameters.java
--- a/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Mon Aug 11 08:18:32 2014 -0300
@@ -141,9 +141,9 @@
         StringBuilder sb = new StringBuilder();
         sb.append("LDAPCertStoreParameters: [\n");
 
-        sb.append("  serverName: " + serverName + "\n");
-        sb.append("  port: " + port + "\n");
-        sb.append("]");
+        sb.append("  serverName: ").append(serverName).append('\n');
+        sb.append("  port: ").append(port).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXBuilderParameters.java
--- a/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Mon Aug 11 08:18:32 2014 -0300
@@ -192,7 +192,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Maximum Path Length: " + maxPathLength + "\n");
+        sb.append("  Maximum Path Length: ").append(maxPathLength).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Mon Aug 11 08:18:32 2014 -0300
@@ -108,12 +108,14 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("PKIXCertPathBuilderResult: [\n");
-        sb.append("  Certification Path: " + certPath + "\n");
-        sb.append("  Trust Anchor: " + getTrustAnchor().toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(getPolicyTree()) + "\n");
-        sb.append("  Subject Public Key: " + getPublicKey() + "\n");
-        sb.append("]");
+		sb.append("PKIXCertPathBuilderResult: [\n");
+		sb.append("  Certification Path: ").append(certPath).append('\n');
+		sb.append("  Trust Anchor: ").append(getTrustAnchor().toString())
+				.append('\n');
+		sb.append("  Policy Tree: ").append(String.valueOf(getPolicyTree()))
+				.append('\n');
+		sb.append("  Subject Public Key: ").append(getPublicKey()).append('\n');
+		sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Mon Aug 11 08:18:32 2014 -0300
@@ -150,10 +150,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathValidatorResult: [\n");
-        sb.append("  Trust Anchor: " + trustAnchor.toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(policyTree) + "\n");
-        sb.append("  Subject Public Key: " + subjectPublicKey + "\n");
-        sb.append("]");
+        sb.append("  Trust Anchor: ").append(trustAnchor.toString()).append('\n');
+        sb.append("  Policy Tree: ").append(String.valueOf(policyTree)).append('\n');
+        sb.append("  Subject Public Key: ").append(subjectPublicKey).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXParameters.java
--- a/src/share/classes/java/security/cert/PKIXParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXParameters.java	Mon Aug 11 08:18:32 2014 -0300
@@ -698,8 +698,7 @@
 
         /* start with trusted anchor info */
         if (unmodTrustAnchors != null) {
-            sb.append("  Trust Anchors: " + unmodTrustAnchors.toString()
-                + "\n");
+            sb.append("  Trust Anchors: ").append(unmodTrustAnchors.toString()).append('\n');
         }
 
         /* now, append initial state information */
@@ -707,30 +706,37 @@
             if (unmodInitialPolicies.isEmpty()) {
                 sb.append("  Initial Policy OIDs: any\n");
             } else {
-                sb.append("  Initial Policy OIDs: ["
-                    + unmodInitialPolicies.toString() + "]\n");
+				sb.append("  Initial Policy OIDs: [")
+						.append(unmodInitialPolicies.toString()).append("]\n");
             }
         }
 
         /* now, append constraints on all certificates in the path */
-        sb.append("  Validity Date: " + String.valueOf(date) + "\n");
-        sb.append("  Signature Provider: " + String.valueOf(sigProvider) + "\n");
-        sb.append("  Default Revocation Enabled: " + revocationEnabled + "\n");
-        sb.append("  Explicit Policy Required: " + explicitPolicyRequired + "\n");
-        sb.append("  Policy Mapping Inhibited: " + policyMappingInhibited + "\n");
-        sb.append("  Any Policy Inhibited: " + anyPolicyInhibited + "\n");
-        sb.append("  Policy Qualifiers Rejected: " + policyQualifiersRejected + "\n");
+		sb.append("  Validity Date: ").append(String.valueOf(date))
+				.append('\n');
+		sb.append("  Signature Provider: ").append(String.valueOf(sigProvider))
+				.append('\n');
+		sb.append("  Default Revocation Enabled: ").append(revocationEnabled)
+				.append('\n');
+		sb.append("  Explicit Policy Required: ")
+				.append(explicitPolicyRequired).append('\n');
+		sb.append("  Policy Mapping Inhibited: ")
+				.append(policyMappingInhibited).append('\n');
+		sb.append("  Any Policy Inhibited: ").append(anyPolicyInhibited)
+				.append('\n');
+		sb.append("  Policy Qualifiers Rejected: ")
+				.append(policyQualifiersRejected).append('\n');
 
         /* now, append target cert requirements */
-        sb.append("  Target Cert Constraints: " + String.valueOf(certSelector) + "\n");
+		sb.append("  Target Cert Constraints: ")
+				.append(String.valueOf(certSelector)).append('\n');
 
         /* finally, append miscellaneous parameters */
         if (certPathCheckers != null)
-            sb.append("  Certification Path Checkers: ["
-                + certPathCheckers.toString() + "]\n");
+            sb.append("  Certification Path Checkers: [").append(certPathCheckers.toString()).append("]\n");
         if (certStores != null)
-            sb.append("  CertStores: [" + certStores.toString() + "]\n");
-        sb.append("]");
+            sb.append("  CertStores: [").append(certStores.toString()).append("]\n");
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PolicyQualifierInfo.java
--- a/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Mon Aug 11 08:18:32 2014 -0300
@@ -163,10 +163,11 @@
         HexDumpEncoder enc = new HexDumpEncoder();
         StringBuilder sb = new StringBuilder();
         sb.append("PolicyQualifierInfo: [\n");
-        sb.append("  qualifierID: " + mId + "\n");
-        sb.append("  qualifier: " +
-            (mData == null ? "null" : enc.encodeBuffer(mData)) + "\n");
-        sb.append("]");
+        sb.append("  qualifierID: ").append(mId).append('\n');
+		sb.append("  qualifier: ")
+				.append(mData == null ? "null" : enc.encodeBuffer(mData))
+				.append('\n');
+        sb.append(']');
         pqiString = sb.toString();
         return pqiString;
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/TrustAnchor.java
--- a/src/share/classes/java/security/cert/TrustAnchor.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/TrustAnchor.java	Mon Aug 11 08:18:32 2014 -0300
@@ -320,14 +320,18 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         if (pubKey != null) {
-            sb.append("  Trusted CA Public Key: " + pubKey.toString() + "\n");
-            sb.append("  Trusted CA Issuer Name: "
-                + String.valueOf(caName) + "\n");
+			sb.append("  Trusted CA Public Key: ").append(pubKey.toString())
+					.append('\n');
+			sb.append("  Trusted CA Issuer Name: ")
+					.append(String.valueOf(caName)).append('\n');
         } else {
-            sb.append("  Trusted CA cert: " + trustedCert.toString() + "\n");
+			sb.append("  Trusted CA cert: ").append(trustedCert.toString())
+					.append('\n');
         }
-        if (nc != null)
-            sb.append("  Name Constraints: " + nc.toString() + "\n");
+        if (nc != null) {
+			sb.append("  Name Constraints: ").append(nc.toString())
+					.append('\n');
+        }
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CRLSelector.java
--- a/src/share/classes/java/security/cert/X509CRLSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CRLSelector.java	Mon Aug 11 08:18:32 2014 -0300
@@ -572,17 +572,17 @@
             sb.append("  IssuerNames:\n");
             Iterator<Object> i = issuerNames.iterator();
             while (i.hasNext())
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
         }
         if (minCRL != null)
-            sb.append("  minCRLNumber: " + minCRL + "\n");
+            sb.append("  minCRLNumber: ").append(minCRL).append('\n');
         if (maxCRL != null)
-            sb.append("  maxCRLNumber: " + maxCRL + "\n");
+            sb.append("  maxCRLNumber: ").append(maxCRL).append('\n');
         if (dateAndTime != null)
-            sb.append("  dateAndTime: " + dateAndTime + "\n");
+            sb.append("  dateAndTime: ").append(dateAndTime).append('\n');
         if (certChecking != null)
-            sb.append("  Certificate being checked: " + certChecking + "\n");
-        sb.append("]");
+            sb.append("  Certificate being checked: ").append(certChecking).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CertSelector.java
--- a/src/share/classes/java/security/cert/X509CertSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CertSelector.java	Mon Aug 11 08:18:32 2014 -0300
@@ -1814,72 +1814,67 @@
         StringBuilder sb = new StringBuilder();
         sb.append("X509CertSelector: [\n");
         if (x509Cert != null) {
-            sb.append("  Certificate: " + x509Cert.toString() + "\n");
+            sb.append("  Certificate: ").append(x509Cert.toString()).append('\n');
         }
         if (serialNumber != null) {
-            sb.append("  Serial Number: " + serialNumber.toString() + "\n");
+			sb.append("  Serial Number: ").append(serialNumber.toString())
+					.append('\n');
         }
         if (issuer != null) {
-            sb.append("  Issuer: " + getIssuerAsString() + "\n");
+			sb.append("  Issuer: ").append(getIssuerAsString()).append('\n');
         }
         if (subject != null) {
-            sb.append("  Subject: " + getSubjectAsString() + "\n");
+			sb.append("  Subject: ").append(getSubjectAsString()).append('\n');
         }
-        sb.append("  matchAllSubjectAltNames flag: "
-                  + String.valueOf(matchAllSubjectAltNames) + "\n");
+        sb.append("  matchAllSubjectAltNames flag: ")
+                .append(String.valueOf(matchAllSubjectAltNames))
+                .append('\n');
         if (subjectAlternativeNames != null) {
             sb.append("  SubjectAlternativeNames:\n");
             Iterator<List<?>> i = subjectAlternativeNames.iterator();
             while (i.hasNext()) {
                 List<?> list = i.next();
-                sb.append("    type " + list.get(0) +
-                          ", name " + list.get(1) + "\n");
+				sb.append("    type ").append(list.get(0)).append(", name ")
+						.append(list.get(1)).append('\n');
             }
         }
         if (subjectKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Subject Key Identifier: " +
-                      enc.encodeBuffer(subjectKeyID) + "\n");
+            sb.append("  Subject Key Identifier: ").append(enc.encodeBuffer(subjectKeyID)).append('\n');
         }
         if (authorityKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Authority Key Identifier: " +
-                      enc.encodeBuffer(authorityKeyID) + "\n");
+            sb.append("  Authority Key Identifier: ").append(enc.encodeBuffer(authorityKeyID)).append('\n');
         }
         if (certificateValid != null) {
-            sb.append("  Certificate Valid: " +
-                      certificateValid.toString() + "\n");
+            sb.append("  Certificate Valid: ").append(certificateValid.toString()).append('\n');
         }
         if (privateKeyValid != null) {
-            sb.append("  Private Key Valid: " +
-                      privateKeyValid.toString() + "\n");
+            sb.append("  Private Key Valid: ").append(privateKeyValid.toString()).append('\n');
         }
         if (subjectPublicKeyAlgID != null) {
-            sb.append("  Subject Public Key AlgID: " +
-                      subjectPublicKeyAlgID.toString() + "\n");
+            sb.append("  Subject Public Key AlgID: ").append(subjectPublicKeyAlgID.toString()).append('\n');
         }
         if (subjectPublicKey != null) {
-            sb.append("  Subject Public Key: " +
-                      subjectPublicKey.toString() + "\n");
+            sb.append("  Subject Public Key: ").append(subjectPublicKey.toString()).append('\n');
         }
         if (keyUsage != null) {
-            sb.append("  Key Usage: " + keyUsageToString(keyUsage) + "\n");
+            sb.append("  Key Usage: ").append(keyUsageToString(keyUsage)).append('\n');
         }
         if (keyPurposeSet != null) {
-            sb.append("  Extended Key Usage: " +
-                      keyPurposeSet.toString() + "\n");
+            sb.append("  Extended Key Usage: ").append(keyPurposeSet.toString()).append('\n');
         }
         if (policy != null) {
-            sb.append("  Policy: " + policy.toString() + "\n");
+            sb.append("  Policy: ").append(policy.toString()).append('\n');
         }
         if (pathToGeneralNames != null) {
             sb.append("  Path to names:\n");
             Iterator<GeneralNameInterface> i = pathToGeneralNames.iterator();
             while (i.hasNext()) {
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
             }
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/rmi/dgc/VMID.java
--- a/src/share/classes/java/rmi/dgc/VMID.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/rmi/dgc/VMID.java	Mon Aug 11 08:18:32 2014 -0300
@@ -124,8 +124,7 @@
         if (addr != null)
             for (int i = 0; i < addr.length; ++ i) {
                 int x = addr[i] & 0xFF;
-                sb.append((x < 0x10 ? "0" : "") +
-                          Integer.toString(x, 16));
+                sb.append(x < 0x10 ? "0" : "").append(Integer.toString(x, 16));
             }
         sb.append(':');
         sb.append(uid.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/lang/management/MemoryUsage.java
--- a/src/share/classes/java/lang/management/MemoryUsage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/MemoryUsage.java	Mon Aug 11 08:18:32 2014 -0300
@@ -237,13 +237,16 @@
      * Returns a descriptive representation of this memory usage.
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder();
-        buf.append("init = " + init + "(" + (init >> 10) + "K) ");
-        buf.append("used = " + used + "(" + (used >> 10) + "K) ");
-        buf.append("committed = " + committed + "(" +
-                   (committed >> 10) + "K) " );
-        buf.append("max = " + max + "(" + (max >> 10) + "K)");
-        return buf.toString();
+        StringBuilder sb = new StringBuilder();
+		sb.append("init = ").append(init).append('(').append(init >> 10)
+				.append("K) ");
+		sb.append("used = ").append(used).append('(').append(used >> 10)
+				.append("K) ");
+		sb.append("committed = ").append(committed).append('(')
+				.append(committed >> 10).append("K) ");
+		sb.append("max = ").append(max).append('(').append(max >> 10)
+				.append("K)");
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/java/lang/management/ThreadInfo.java
--- a/src/share/classes/java/lang/management/ThreadInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/ThreadInfo.java	Mon Aug 11 08:18:32 2014 -0300
@@ -579,15 +579,17 @@
      * @return a string representation of this thread info.
      */
     public String toString() {
-        StringBuilder sb = new StringBuilder("\"" + getThreadName() + "\"" +
-                                             " Id=" + getThreadId() + " " +
-                                             getThreadState());
+    	StringBuilder sb = new StringBuilder();
+    	sb.append('"').append(getThreadName()).append('"')
+    	.append(" Id=").append(getThreadId()).append(' ')
+    	.append(getThreadState());
+
         if (getLockName() != null) {
-            sb.append(" on " + getLockName());
+            sb.append(" on ").append(getLockName());
         }
         if (getLockOwnerName() != null) {
-            sb.append(" owned by \"" + getLockOwnerName() +
-                      "\" Id=" + getLockOwnerId());
+            sb.append(" owned by \"").append(getLockOwnerName())
+                    .append("\" Id=").append(getLockOwnerId());
         }
         if (isSuspended()) {
             sb.append(" (suspended)");
@@ -599,21 +601,21 @@
         int i = 0;
         for (; i < stackTrace.length && i < MAX_FRAMES; i++) {
             StackTraceElement ste = stackTrace[i];
-            sb.append("\tat " + ste.toString());
+            sb.append("\tat ").append(ste.toString());
             sb.append('\n');
             if (i == 0 && getLockInfo() != null) {
                 Thread.State ts = getThreadState();
                 switch (ts) {
                     case BLOCKED:
-                        sb.append("\t-  blocked on " + getLockInfo());
+                        sb.append("\t-  blocked on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case TIMED_WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     default:
@@ -622,7 +624,7 @@
 
             for (MonitorInfo mi : lockedMonitors) {
                 if (mi.getLockedStackDepth() == i) {
-                    sb.append("\t-  locked " + mi);
+                    sb.append("\t-  locked ").append(mi);
                     sb.append('\n');
                 }
             }
@@ -634,10 +636,10 @@
 
        LockInfo[] locks = getLockedSynchronizers();
        if (locks.length > 0) {
-           sb.append("\n\tNumber of locked synchronizers = " + locks.length);
+           sb.append("\n\tNumber of locked synchronizers = ").append(locks.length);
            sb.append('\n');
            for (LockInfo li : locks) {
-               sb.append("\t- " + li);
+               sb.append("\t- ").append(li);
                sb.append('\n');
            }
        }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHParameters.java
--- a/src/share/classes/com/sun/crypto/provider/DHParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHParameters.java	Mon Aug 11 08:18:31 2014 -0300
@@ -137,8 +137,11 @@
                                + Debug.toHexString(this.p)
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
-        if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+        if (this.l != 0) {
+            sb.append(LINE_SEP).append("l:")
+            .append(LINE_SEP).append("    ")
+            .append(this.l);
+        }
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHPublicKey.java
--- a/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Mon Aug 11 08:18:31 2014 -0300
@@ -268,8 +268,10 @@
                                + Debug.toHexString(this.p)
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
-        if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+        if (this.l != 0) {
+            sb.append(LINE_SEP).append("l:").append(LINE_SEP)
+            .append("    ").append(this.l);
+        }
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/GCMParameters.java
--- a/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Mon Aug 11 08:18:31 2014 -0300
@@ -140,7 +140,8 @@
             = new StringBuilder(LINE_SEP + "    iv:" + LINE_SEP + "["
                 + encoder.encodeBuffer(iv) + "]");
 
-        sb.append(LINE_SEP + "tLen(bits):" + LINE_SEP + tLen*8 + LINE_SEP);
+        sb.append(LINE_SEP).append("tLen(bits):").append(LINE_SEP)
+        .append(tLen * 8).append(LINE_SEP);
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/OAEPParameters.java
--- a/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Mon Aug 11 08:18:31 2014 -0300
@@ -238,11 +238,12 @@
     }
 
     protected String engineToString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("MD: " + mdName + "\n");
-        sb.append("MGF: MGF1" + mgfSpec.getDigestAlgorithm() + "\n");
-        sb.append("PSource: PSpecified " +
-            (p.length==0? "":Debug.toHexString(new BigInteger(p))) + "\n");
-        return sb.toString();
+		StringBuilder sb = new StringBuilder();
+		sb.append("MD: ").append(mdName).append('\n');
+		sb.append("MGF: MGF1").append(mgfSpec.getDigestAlgorithm())
+				.append('\n');
+		sb.append("PSource: PSpecified ").append(p.length == 0 ? "" : 
+			Debug.toHexString(new BigInteger(p))).append('\n');
+		return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/RC2Parameters.java
--- a/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Mon Aug 11 08:18:31 2014 -0300
@@ -221,8 +221,9 @@
                 + encoder.encodeBuffer(iv) + "]");
 
         if (version != 0) {
-            sb.append(LINE_SEP + "version:" + LINE_SEP
-                + version + LINE_SEP);
+            sb.append(LINE_SEP).append("version:")
+                    .append(LINE_SEP).append(version)
+                    .append(LINE_SEP);
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Mon Aug 11 08:18:31 2014 -0300
@@ -65,7 +65,7 @@
                 "extractSubNet", "BINARY ARRAY :");
             StringBuilder sb = new StringBuilder();
             for(int i =0; i < addrLength; i++) {
-                sb.append((b[i] & 0xFF) + ":");
+                sb.append(b[i] & 0xFF).append(':');
             }
             SNMP_LOGGER.logp(Level.FINEST, NetMaskImpl.class.getName(),
                 "extractSubNet", sb.toString());
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Mon Aug 11 08:18:31 2014 -0300
@@ -204,7 +204,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Mon Aug 11 08:18:31 2014 -0300
@@ -379,7 +379,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(IDENTIFIER);
-   jjtn000.name.append( "." + t.image);
+   jjtn000.name.append('.').append(t.image);
       }
     } finally {
     if (jjtc000) {
@@ -408,7 +408,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -454,7 +454,7 @@
         }
         jj_consume_token(MARK);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -483,7 +483,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
       jj_consume_token(MASK);
       t = jj_consume_token(INTEGER_LITERAL);
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Mon Aug 11 08:18:31 2014 -0300
@@ -99,7 +99,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java
--- a/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Mon Aug 11 08:18:31 2014 -0300
@@ -479,10 +479,10 @@
      */
     public String printMessage() {
         StringBuilder sb = new StringBuilder();
-        sb.append("msgId : " + msgId + "\n");
-        sb.append("msgMaxSize : " + msgMaxSize + "\n");
-        sb.append("msgFlags : " + msgFlags + "\n");
-        sb.append("msgSecurityModel : " + msgSecurityModel + "\n");
+        sb.append("msgId : ").append(msgId).append('\n');
+        sb.append("msgMaxSize : ").append(msgMaxSize).append('\n');
+        sb.append("msgFlags : ").append(msgFlags).append('\n');
+        sb.append("msgSecurityModel : ").append(msgSecurityModel).append('\n');
 
         if (contextEngineId == null) {
             sb.append("contextEngineId : null");
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
--- a/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Mon Aug 11 08:18:31 2014 -0300
@@ -256,7 +256,7 @@
     private static String stringifyComponent(NameComponent comp) {
         StringBuilder one = new StringBuilder(escape(comp.id));
         if (comp.kind != null && !comp.kind.equals("")) {
-            one.append(kindSeparator + escape(comp.kind));
+            one.append(kindSeparator).append(escape(comp.kind));
         }
         if (one.length() == 0) {
             return ""+kindSeparator;  // if neither id nor kind specified
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java
--- a/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Mon Aug 11 08:18:31 2014 -0300
@@ -90,7 +90,7 @@
                         if (selected == -1) {
                             StringBuilder allChoices = new StringBuilder();
                             for (int j = 0; j <  choices.length; j++) {
-                                allChoices.append(choices[j] + ",");
+                                allChoices.append(choices[j]).append(',');
                             }
                             throw new IOException("Cannot match " +
                                 "'java.naming.security.sasl.realm' property value, '" +
diff -r dde9f5cfde5f src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
--- a/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Mon Aug 11 08:18:31 2014 -0300
@@ -167,9 +167,9 @@
         for (int i = 0; i < allchannelnames.length; i++) {
             if ((channelmask & m) != 0L) {
                 if (i < channelnames.length) {
-                    sb.append(channelnames[i] + " ");
+                    sb.append(channelnames[i]).append(' ');
                 } else {
-                    sb.append(allchannelnames[i] + " ");
+                    sb.append(allchannelnames[i]).append(' ');
                 }
             }
             m *= 2L;
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Mon Aug 11 08:18:31 2014 -0300
@@ -235,14 +235,15 @@
                     String nodeName = att.getNodeName();
                     if ((nodeName.equals("xmlns") || nodeName.startsWith("xmlns:"))
                         && !storedNamespaces.containsKey(att.getNodeName())) {
-                        sb.append(" " + nodeName + "=\"" + att.getNodeValue() + "\"");
+                        sb.append(' ').append(nodeName).append("=\"")
+                        .append(att.getNodeValue()).append('"');
                         storedNamespaces.put(nodeName, att.getNodeValue());
                     }
                 }
             }
             wk = wk.getParentNode();
         }
-        sb.append(">" + source + "</dummy>");
+        sb.append('>').append(source).append("</dummy>");
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Mon Aug 11 08:18:31 2014 -0300
@@ -85,7 +85,7 @@
             if (prefix.equals("xmlns")) {
                 sb.append("#default ");
             } else {
-                sb.append(prefix + " ");
+                sb.append(prefix).append(' ');
             }
         }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Mon Aug 11 08:18:31 2014 -0300
@@ -88,7 +88,7 @@
                 l += countQuotes(DN, j, k);
 
                 if ((k > 0) && (DN.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml) + ",");
+                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml)).append(',');
 
                     i = k + 1;
                     l = 0;
@@ -121,7 +121,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(parseATAV(trim(str.substring(i, k)), toXml) + "+");
+                sb.append(parseATAV(trim(str.substring(i, k)), toXml)).append('+');
 
                 i = k + 1;
                 l = 0;
@@ -369,7 +369,7 @@
         int k;
 
         for (int j = 0; (k = string.indexOf("\\20", j)) >= 0; j = k + 3) {
-            sb.append(trim(string.substring(i, k)) + "\\ ");
+            sb.append(trim(string.substring(i, k))).append("\\ ");
 
             i = k + 3;
         }
@@ -418,7 +418,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(trim(str.substring(i, k)) + replace);
+                sb.append(trim(str.substring(i, k))).append(replace);
 
                 i = k + 1;
                 l = 0;
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/CramMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Mon Aug 11 08:18:31 2014 -0300
@@ -196,8 +196,7 @@
 
         for (i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Mon Aug 11 08:18:31 2014 -0300
@@ -391,8 +391,7 @@
 
         for (int i = 0; i < digest.length; i ++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0"+
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/ParseException.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Mon Aug 11 08:18:31 2014 -0300
@@ -198,7 +198,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Mon Aug 11 08:18:31 2014 -0300
@@ -107,7 +107,7 @@
         default:
           if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
             String s = "0000" + Integer.toString(ch, 16);
-            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+            retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
           } else {
             retval.append(ch);
           }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
--- a/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Mon Aug 11 08:18:31 2014 -0300
@@ -338,10 +338,10 @@
             if (classpath.isEmpty()) {
                 String envcp = System.getProperty("env.class.path");
                 if ((envcp != null) && (envcp.length() > 0)) {
-                    munged.append(" -classpath " + envcp);
+                    munged.append(" -classpath ").append(envcp);
                 }
             } else {
-                munged.append(" -classpath " + classpath.asString());
+                munged.append(" -classpath ").append(classpath.asString());
             }
             return munged.toString();
         } else {
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Mon Aug 11 08:18:31 2014 -0300
@@ -386,37 +386,37 @@
                     }
                     case 'B': {
                         int val = 0xFF & byteAt(i, value);
-                        result.append("0x" + Integer.toString(val, 16));
+                        result.append("0x").append(Integer.toString(val, 16));
                         i++;
                         break;
                     }
                     case 'S': {
                         short val = shortAt(i, value);
                         i += 2;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'I': {
                         int val = intAt(i, value);
                         i += 4;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'J': {         // long
                         long val = longAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
                     case 'F': {
                         float val = floatAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 4;
                         break;
                     }
                     case 'D': {         // double
                         double val = doubleAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
@@ -425,7 +425,7 @@
                     }
                 }
             }
-            result.append("}");
+            result.append('}');
         }
         return result.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/util/Misc.java
--- a/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Mon Aug 11 08:18:31 2014 -0300
@@ -97,11 +97,11 @@
             } else if (ch == '&') {
                 sb.append("&amp;");
             } else if (ch < ' ') {
-                sb.append("&#" + Integer.toString(ch) + ";");
+                sb.append("&#").append(Integer.toString(ch)).append(';');
             } else {
                 int c = (ch & 0xFFFF);
                 if (c > 127) {
-                    sb.append("&#" + Integer.toString(c) + ";");
+                    sb.append("&#").append(Integer.toString(c)).append(';');
                 } else {
                     sb.append(ch);
                 }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
--- a/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Mon Aug 11 08:18:31 2014 -0300
@@ -881,12 +881,12 @@
             } else if (tag == JDWP.TypeTag.ARRAY) {
                 sb.append("ArrayType");
             } else {
-                sb.append("UNKNOWN TAG: " + tag);
+                sb.append("UNKNOWN TAG: ").append(tag);
             }
             if (signature != null) {
-                sb.append(", signature='" + signature + "'");
+                sb.append(", signature='").append(signature).append('\'');
             }
-            sb.append(", id=" + id);
+            sb.append(", id=").append(id);
             vm.printTrace(sb.toString());
         }
         if (id == 0) {

From andrej.golovnin at gmail.com  Mon Aug 11 11:55:47 2014
From: andrej.golovnin at gmail.com (Andrej Golovnin)
Date: Mon, 11 Aug 2014 13:55:47 +0200
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
Message-ID: <CAM6ZMz_=Rt5QySF7tT1st9uSP7czvADx1HUPjdUfPrQ5k5GJ3w@mail.gmail.com>

Hi Ot?vio,

About the template in Parser.jjt, TokenMgrError.java, etc. I don't know how
> can do that. Can anyone help me?
>

See attached diff for the changes in Parser.jjt and Parser.jj. For the
TokenMgrError and ParserException you can just subscribe here:

https://java.net/projects/javacc/lists

on the dev or users mailing lists and send a message to JavaCC project. I'm
sure the developers of JavaCC would help you.

Best regards,
Andrej Golovnin



> About readable of code I just renamed this class to sb instead of buf,
> strbuf, etc. Because using StringBuilder beyond be more explicit I can use
> char instead of a single String.
>
>
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_3.zip
>
>
> On Mon, Aug 11, 2014 at 7:56 AM, Pavel Rappo <pavel.rappo at oracle.com>
> wrote:
>
>> > In the class
>> > src/share/classes/javax/management/openmbean/CompositeType.java you have
>> > added the
>> > annotation
>> @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
>> > instead of fixing the concatenation inside the append method. Why?
>>
>> +1 Moreover, I wonder where this value comes from? I've never seen it
>> before. Here are warnings that javac supports:
>>
>>
>> all,auxiliaryclass,cast,classfile,deprecation,dep-ann,divzero,empty,fallthrough,finally,options,overloads,overrides,path,processing,rawtypes,serial,static,try,unchecked,varargs
>>
>> It doesn't look like one of Eclipse's warnings either.
>>
>> > And I would like to suggest to drop explicit usage of StringBuilder in
>> some
>> > methods at all to improve code readability.
>>
>> Agree.
>>
>> -Pavel
>>
>>
>
>
> --
> Ot?vio Gon?alves de Santana
>
> blog:     http://otaviosantana.blogspot.com.br/
> twitter: http://twitter.com/otaviojava
> site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
> 55 (11) 98255-3513
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140811/b999e2fe/attachment.html>
-------------- next part --------------
diff --git a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
@@ -420,7 +420,7 @@
   t=<IDENTIFIER> { jjtn000.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtn000.name.append( "." + t.image); }
+  {jjtn000.name.append('.').append(t.image); }
 )*/*@bgen(jjtree)*/
   } finally {
     if (jjtc000) {
@@ -447,7 +447,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append('.').append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -501,7 +501,7 @@
   {jjtn000.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append('.).append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -527,7 +527,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append('.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL>/*@bgen(jjtree)*/
                             {
                               jjtree.closeNodeScope(jjtn000, true);
diff --git a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
@@ -213,7 +213,7 @@
   t=<IDENTIFIER> { jjtThis.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtThis.name.append( "." + t.image); }
+  {jjtThis.name.append('.').append(t.image); }
 )*
 
 }
@@ -228,7 +228,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append('.').append(t.image); }
 )*
 
 }
@@ -253,7 +253,7 @@
   {jjtThis.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append('.').append(t.image); }
 )*
 }
 
@@ -267,7 +267,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append('.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL> {jjtThis.mask = t.image; }
 }
 

From andrej.golovnin at gmail.com  Mon Aug 11 11:58:06 2014
From: andrej.golovnin at gmail.com (Andrej Golovnin)
Date: Mon, 11 Aug 2014 13:58:06 +0200
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAM6ZMz_=Rt5QySF7tT1st9uSP7czvADx1HUPjdUfPrQ5k5GJ3w@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz_=Rt5QySF7tT1st9uSP7czvADx1HUPjdUfPrQ5k5GJ3w@mail.gmail.com>
Message-ID: <CAM6ZMz-o3Kfr1NFzLpKgaa0YnRpeEXfQVU_=YVen2FQoPP2rKQ@mail.gmail.com>

Hi Ot?vio,

please ignore the previous diff. I'm sorry, there was a small mistake. I
have attached the corrected version.

Best regards,
Andrej Golovnin


On Mon, Aug 11, 2014 at 1:55 PM, Andrej Golovnin <andrej.golovnin at gmail.com>
wrote:

> Hi Ot?vio,
>
>  About the template in Parser.jjt, TokenMgrError.java, etc. I don't know
>> how can do that. Can anyone help me?
>>
>
> See attached diff for the changes in Parser.jjt and Parser.jj. For the
> TokenMgrError and ParserException you can just subscribe here:
>
> https://java.net/projects/javacc/lists
>
> on the dev or users mailing lists and send a message to JavaCC project.
> I'm sure the developers of JavaCC would help you.
>
> Best regards,
> Andrej Golovnin
>
>
>
>>  About readable of code I just renamed this class to sb instead of buf,
>> strbuf, etc. Because using StringBuilder beyond be more explicit I can use
>> char instead of a single String.
>>
>>
>> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_3.zip
>>
>>
>> On Mon, Aug 11, 2014 at 7:56 AM, Pavel Rappo <pavel.rappo at oracle.com>
>> wrote:
>>
>>> > In the class
>>> > src/share/classes/javax/management/openmbean/CompositeType.java you
>>> have
>>> > added the
>>> > annotation
>>> @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
>>> > instead of fixing the concatenation inside the append method. Why?
>>>
>>> +1 Moreover, I wonder where this value comes from? I've never seen it
>>> before. Here are warnings that javac supports:
>>>
>>>
>>> all,auxiliaryclass,cast,classfile,deprecation,dep-ann,divzero,empty,fallthrough,finally,options,overloads,overrides,path,processing,rawtypes,serial,static,try,unchecked,varargs
>>>
>>> It doesn't look like one of Eclipse's warnings either.
>>>
>>> > And I would like to suggest to drop explicit usage of StringBuilder in
>>> some
>>> > methods at all to improve code readability.
>>>
>>> Agree.
>>>
>>> -Pavel
>>>
>>>
>>
>>
>> --
>> Ot?vio Gon?alves de Santana
>>
>> blog:     http://otaviosantana.blogspot.com.br/
>> twitter: http://twitter.com/otaviojava
>> site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
>> 55 (11) 98255-3513
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140811/4abc23d7/attachment.html>
-------------- next part --------------
diff --git a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
@@ -420,7 +420,7 @@
   t=<IDENTIFIER> { jjtn000.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtn000.name.append( "." + t.image); }
+  {jjtn000.name.append('.').append(t.image); }
 )*/*@bgen(jjtree)*/
   } finally {
     if (jjtc000) {
@@ -447,7 +447,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append('.').append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -501,7 +501,7 @@
   {jjtn000.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append('.').append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -527,7 +527,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append('.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL>/*@bgen(jjtree)*/
                             {
                               jjtree.closeNodeScope(jjtn000, true);
diff --git a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
@@ -213,7 +213,7 @@
   t=<IDENTIFIER> { jjtThis.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtThis.name.append( "." + t.image); }
+  {jjtThis.name.append('.').append(t.image); }
 )*
 
 }
@@ -228,7 +228,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append('.').append(t.image); }
 )*
 
 }
@@ -253,7 +253,7 @@
   {jjtThis.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append('.').append(t.image); }
 )*
 }
 
@@ -267,7 +267,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append('.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL> {jjtThis.mask = t.image; }
 }
 

From andrej.golovnin at gmail.com  Mon Aug 11 13:12:02 2014
From: andrej.golovnin at gmail.com (Andrej Golovnin)
Date: Mon, 11 Aug 2014 15:12:02 +0200
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
Message-ID: <CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>

Hi,

About readable of code I just renamed this class to sb instead of buf,
> strbuf, etc.
>

I doubt that renaming variables does really improve the code readability.
And you changed the indentation (take look at other classes too):

 239     public String toString() {
 240         StringBuilder sb = new StringBuilder();
 241                 sb.append("init =
").append(init).append('(').append(init >> 10)
 242                                 .append("K) ");
 243                 sb.append("used =
").append(used).append('(').append(used >> 10)
 244                                 .append("K) ");
 245                 sb.append("committed = ").append(committed).append('(')
 246                                 .append(committed >> 10).append("K) ");
 247                 sb.append("max = ").append(max).append('(').append(max
>> 10)
 248                                 .append("K)");
 249         return sb.toString();
 250     }

Because using StringBuilder beyond be more explicit I can use char instead
> of a single String.
>

In the most classes I mentioned in my previous mail only the
#toString()-methods would be affected by the proposal. And in the most
cases, maybe in all cases, the #toString()-methods in this classes exists
only to provide nice output. I would not consider them
performance-critical. Btw. I see here a nice opportunity to create an RFE
for the Javac team. Following code:

Object o1 = ...;
Object o2 = ...;
String s = "abc" + o1 + "c" + o2 + "\n";

should be translated to:

String s = new
StringBuilder().append("abc").append(o1).append('c').append(o2).append('\n').toString();

instead of:

String s = new
StringBuilder().append("abc").append(o1).append("c").append(o2).append("\n").toString();

Best regards,
Andrej Golovnin


>
>
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_3.zip
>
>
> On Mon, Aug 11, 2014 at 7:56 AM, Pavel Rappo <pavel.rappo at oracle.com>
> wrote:
>
>> > In the class
>> > src/share/classes/javax/management/openmbean/CompositeType.java you have
>> > added the
>> > annotation
>> @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
>> > instead of fixing the concatenation inside the append method. Why?
>>
>> +1 Moreover, I wonder where this value comes from? I've never seen it
>> before. Here are warnings that javac supports:
>>
>>
>> all,auxiliaryclass,cast,classfile,deprecation,dep-ann,divzero,empty,fallthrough,finally,options,overloads,overrides,path,processing,rawtypes,serial,static,try,unchecked,varargs
>>
>> It doesn't look like one of Eclipse's warnings either.
>>
>> > And I would like to suggest to drop explicit usage of StringBuilder in
>> some
>> > methods at all to improve code readability.
>>
>> Agree.
>>
>> -Pavel
>>
>>
>
>
> --
> Ot?vio Gon?alves de Santana
>
> blog:     http://otaviosantana.blogspot.com.br/
> twitter: http://twitter.com/otaviojava
> site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
> 55 (11) 98255-3513
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140811/67c78c55/attachment.html>

From otaviojava at java.net  Tue Aug 12 00:14:44 2014
From: otaviojava at java.net (=?UTF-8?Q?Ot=C3=A1vio_Gon=C3=A7alves_de_Santana?=)
Date: Mon, 11 Aug 2014 21:14:44 -0300
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
Message-ID: <CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>

Done.
I understand about StringJoiner, but no one is applicable.
Also believe that there are many ways to get the code more readable, but I
believe the best strategy is doing it in baby steps.

https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_4.zip


On Mon, Aug 11, 2014 at 11:33 AM, Pavel Rappo <pavel.rappo at oracle.com>
wrote:

> Otavio,
>
> Just skimmed through your changes. It looks good. But there are some
> things we can make a little bit better though. IMO, it's not always a
> performance that matters (looking around to see if Alexey Shipilev is
> somewhere near) but readability. It's good to estimate performance
> requirements of a code before making a decision of whether to sacrifice
> readability for performance or not. I noticed there are some methods that
> are screaming for readability improvements. Namely, different versions of
> joining strings through a separator. You can find them in following methods
> in your changeset:
>
>         sun.security.acl.AclEntryImpl::toString
>         sun.security.ssl.HandshakeMessage.CertificateRequest::print
>         javax.swing.MultiUIDefaults::toString (one of the most bizarre one)
>         sun.security.provider.PolicyFile::expandSelf
>         java.security.ProtectionDomain::toString
>         javax.management.relation.Role::toString
>         sun.security.ssl.SupportedEllipticCurvesExtension::toString
>         sun.tools.jstat.SyntaxException::SyntaxException
>
> Unfortunately, neither java.util.StringJoiner nor String.join have perfect
> (but who has?) APIs. So it's up to us to figure out the best way of joining
> elements. So when the power of those guys is not enough, we can go this way
> (or maybe some else):
>
>         Iterable<?> elements = ...
>         StringJoiner j = new StringJoiner(", ");
>         elements.forEach(e -> j.add(e.toString()));
>
> or
>
>         Collection<?> elements = ...
>         String i = elements.stream()
>                            .map(Object::toString)
>                            .collect(Collectors.joining(", "));
>
> Other than that:
>
> 1. It looks like some StringBuffers are still lurking out there. We should
> change them to StringBuilders, *only if* we can prove they are not exposed
> to more than one thread:
>
> --- dev/jdk/src/share/classes/javax/sound/sampled/AudioFileFormat.java
>  (revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
> +++ dev/jdk/src/share/classes/javax/sound/sampled/AudioFileFormat.java
>  (revision 10452+:8e501e6bbf1f+)
> @@ -272,7 +272,7 @@
>      @Override
>      public String toString() {
>
> -        StringBuffer sb = new StringBuffer();
> +        StringBuilder sb = new StringBuilder();
>
>          //$$fb2002-11-01: fix for 4672864: AudioFileFormat.toString()
> throws unexpected NullPointerException
>          if (type != null) {
>
> ---
> dev/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
>      (revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
> +++
> dev/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
>      (revision 10452+:8e501e6bbf1f+)
> @@ -346,12 +346,12 @@
>
>      public String valueString(boolean bigLimit) {
>          // Char arrays deserve special treatment
> -        StringBuffer result;
> +        StringBuilder result;
>          byte[] value = getValue();
>          int max = value.length;
>          byte elementSignature = getElementType();
>          if (elementSignature == 'C')  {
> -            result = new StringBuffer();
> +            result = new StringBuilder();
>              for (int i = 0; i < value.length; ) {
>                  char val = charAt(i, value);
>                  result.append(val);
> @@ -362,7 +362,7 @@
>              if (bigLimit) {
>                  limit = 1000;
>              }
> -            result = new StringBuffer("{");
> +            result = new StringBuilder("{");
>              int num = 0;
>              for (int i = 0; i < value.length; ) {
>                  if (num > 0) {
>
> --- dev/jdk/src/share/classes/javax/swing/GroupLayout.java      (revision
> 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
> +++ dev/jdk/src/share/classes/javax/swing/GroupLayout.java      (revision
> 10452+:8e501e6bbf1f+)
> @@ -1213,7 +1213,7 @@
>              registerComponents(horizontalGroup, HORIZONTAL);
>              registerComponents(verticalGroup, VERTICAL);
>          }
> -        StringBuffer buffer = new StringBuffer();
> +        StringBuilder buffer = new StringBuilder();
>          buffer.append("HORIZONTAL\n");
>          createSpringDescription(buffer, horizontalGroup, "  ",
> HORIZONTAL);
>          buffer.append("\nVERTICAL\n");
> @@ -1221,7 +1221,7 @@
>          return buffer.toString();
>      }
>
> -    private void createSpringDescription(StringBuffer buffer, Spring
> spring,
> +    private void createSpringDescription(StringBuilder buffer, Spring
> spring,
>              String indent, int axis) {
>          String origin = "";
>          String padding = "";
>
> ---
> dev/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
> (revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
> +++
> dev/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
> (revision 10452+:8e501e6bbf1f+)
> @@ -463,7 +463,7 @@
>
>      // ---------
>
> -    private static void appendIfLiteralAddress(String addr, StringBuffer
> sb) {
> +    private static void appendIfLiteralAddress(String addr, StringBuilder
> sb) {
>          if (IPAddressUtil.isIPv4LiteralAddress(addr)) {
>              sb.append("dns://").append(addr).append(' ');
>          } else {
> @@ -478,10 +478,8 @@
>       *         corresponding to the supplied List of nameservers.
>       */
>      private static String createProviderURL(List<String> nsList) {
> -        StringBuffer sb = new StringBuffer();
> -        for (String s: nsList) {
> -            appendIfLiteralAddress(s, sb);
> -        }
> +        StringBuilder sb = new StringBuilder();
> +        nsList.forEach(s -> appendIfLiteralAddress(s, sb));
>          return sb.toString();
>      }
>
> @@ -491,7 +489,7 @@
>       *         contained in the provided str.
>       */
>      private static String createProviderURL(String str) {
> -        StringBuffer sb = new StringBuffer();
> +        StringBuilder sb = new StringBuilder();
>          StringTokenizer st = new StringTokenizer(str, ",");
>          while (st.hasMoreTokens()) {
>              appendIfLiteralAddress(st.nextToken(), sb);
>
>
> 2. Also there are some minor issues with line width and readability:
>
> --- dev/jdk/src/share/classes/java/security/cert/CertPath.java  (revision
> 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
> +++ dev/jdk/src/share/classes/java/security/cert/CertPath.java  (revision
> 10452+:8e501e6bbf1f+)
> @@ -224,16 +224,16 @@
>          Iterator<? extends Certificate> stringIterator =
>                                          getCertificates().iterator();
>
> -        sb.append('\n').append(type).append(" Cert Path: length =
> ").append(getCertificates().size()).append(".\n");
> -        sb.append("[\n");
> +        sb.append('\n').append(type).append(" Cert Path: length = ")
> +          .append(getCertificates().size()).append(".\n").append("[\n");
>          int i = 1;
>          while (stringIterator.hasNext()) {
> -            sb.append("==========================================" +
> "===============Certificate ")
> -                    .append(i).append(" start.\n");
> +            sb.append("==========================================")
> +              .append("===============Certificate ").append(i).append("
> start.\n");
>              Certificate stringCert = stringIterator.next();
> -            sb.append(stringCert.toString());
> -            sb.append("\n========================================" +
> "=================Certificate ")
> -                    .append(i).append(" end.\n\n\n");
> +            sb.append(stringCert.toString()).append('\n');
> +            sb.append("========================================")
> +              .append("=================Certificate ").append(i).append("
> end.\n\n\n");
>              i++;
>          }
>
> --- dev/jdk/src/share/classes/javax/swing/JColorChooser.java    (revision
> 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
> +++ dev/jdk/src/share/classes/javax/swing/JColorChooser.java    (revision
> 10452+:8e501e6bbf1f+)
> @@ -543,7 +543,7 @@
>       * @return  a string representation of this <code>JColorChooser</code>
>       */
>      protected String paramString() {
> -        StringBuilder chooserPanelsString = new StringBuilder("");
> +        StringBuilder chooserPanelsString = new StringBuilder();
>          for (int i=0; i<chooserPanels.length; i++) {
>
>  chooserPanelsString.append('[').append(chooserPanels[i].toString()).append(']');
>          }
>
> 3. Btw, I wonder what "try ... catch" is doing here. Haven't we checked
> enum_.hasMoreElements() is true? (I guess it's a question to the security
> team).
>
> --- dev/jdk/src/share/classes/java/security/PermissionCollection.java
> (revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
> +++ dev/jdk/src/share/classes/java/security/PermissionCollection.java
> (revision 10452+:8e501e6bbf1f+)
> @@ -181,13 +181,9 @@
>          StringBuilder sb = new StringBuilder();
>          sb.append(super.toString()).append(" (\n");
>          while (enum_.hasMoreElements()) {
> -            try {
> -                sb.append(' ');
> -                sb.append(enum_.nextElement().toString());
> -                sb.append('\n');
> +            sb.append(' ');
> +            sb.append(enum_.nextElement().toString());
> +            sb.append('\n');
> -            } catch (NoSuchElementException e){
> -                // ignore
> -            }
>          }
>          sb.append(")\n");
>          return sb.toString();
>
> 4. This method looks dead (not used):
>
> ---
> dev/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
>       (revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
> +++
> dev/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
>       (revision 10452+:8e501e6bbf1f+)
> @@ -348,15 +348,4 @@
>              return javaArgs;
>          }
>      }
> -
> -    private String appendPath(String path1, String path2) {
> -        if (path1 == null || path1.length() == 0) {
> -            return path2 == null ? "." : path2;
> -        } else if (path2 == null || path2.length() == 0) {
> -            return path1;
> -        } else {
> -            return path1  + File.pathSeparator + path2;
> -        }
> -    }
> -
>  }
>
> -Pavel




-- 
Ot?vio Gon?alves de Santana

blog:     http://otaviosantana.blogspot.com.br/
twitter: http://twitter.com/otaviojava
site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
55 (11) 98255-3513
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140811/62b6ae5d/attachment.html>
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/ThreadTab.java
--- a/src/share/classes/sun/tools/jconsole/ThreadTab.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/ThreadTab.java	Mon Aug 11 21:07:58 2014 -0300
@@ -368,7 +368,7 @@
                             sb.append(Messages.STACK_TRACE);
                             int index = 0;
                             for (StackTraceElement e : ti.getStackTrace()) {
-                                sb.append(e.toString()+"\n");
+                                sb.append(e.toString()).append('\n');
                                 if (monitors != null) {
                                     for (MonitorInfo mi : monitors) {
                                         if (mi.getLockedStackDepth() == index) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Mon Aug 11 21:07:58 2014 -0300
@@ -79,25 +79,25 @@
             String textColor = String.format("%06x",
                                              foreground.getRGB() & 0xFFFFFF);
             StringBuilder sb = new StringBuilder();
-            sb.append("<html><body text=#"+textColor+"><table width=\"100%\">");
+            sb.append("<html><body text=#").append(textColor).append("><table width=\"100%\">");
             for (int i = 0; i < arr.length; i++) {
                 if (i % 2 == 0) {
-                    sb.append("<tr style=\"background-color: " +
-                            evenRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(evenRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 } else {
-                    sb.append("<tr style=\"background-color: " +
-                            oddRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(oddRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 }
             }
             if (arr.length == 0) {
-                sb.append("<tr style=\"background-color: " +
-                        evenRowColorStr + "\"><td></td></tr>");
+				sb.append("<tr style=\"background-color: ")
+						.append(evenRowColorStr).append("\"><td></td></tr>");
             }
             sb.append("</table></body></html>");
             arrayEditor.setText(sb.toString());
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XTree.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Mon Aug 11 21:07:58 2014 -0300
@@ -507,13 +507,13 @@
         // key order defined by the "orderedKeyPropertyList"
         for (String key : orderedKeyPropertyList) {
             if (map.containsKey(key)) {
-                sb.append(key + "=" + map.get(key) + ",");
+                sb.append(key).append('=').append(map.get(key)).append(',');
                 map.remove(key);
             }
         }
         // Add the remaining key/value pairs to the buffer
         for (Map.Entry<String, String> entry : map.entrySet()) {
-            sb.append(entry.getKey() + "=" + entry.getValue() + ",");
+            sb.append(entry.getKey()).append('=').append(entry.getValue()).append(',');
         }
         String orderedKeyPropertyListString = sb.toString();
         orderedKeyPropertyListString = orderedKeyPropertyListString.substring(
@@ -622,7 +622,7 @@
                     //
                     StringBuilder sb = new StringBuilder();
                     for (MBeanParameterInfo mbpi : mboi.getSignature()) {
-                        sb.append(mbpi.getType() + ",");
+                        sb.append(mbpi.getType()).append(',');
                     }
                     String signature = sb.toString();
                     if (signature.length() > 0) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jps/Jps.java
--- a/src/share/classes/sun/tools/jps/Jps.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jps/Jps.java	Mon Aug 11 21:07:58 2014 -0300
@@ -92,28 +92,28 @@
                     vm = monitoredHost.getMonitoredVm(id, 0);
 
                     errorString = " -- main class information unavailable";
-                    output.append(" " + MonitoredVmUtil.mainClass(vm,
+                    output.append(' ').append(MonitoredVmUtil.mainClass(vm,
                             arguments.showLongPaths()));
 
                     if (arguments.showMainArgs()) {
                         errorString = " -- main args information unavailable";
                         String mainArgs = MonitoredVmUtil.mainArgs(vm);
                         if (mainArgs != null && mainArgs.length() > 0) {
-                            output.append(" " + mainArgs);
+                            output.append(' ').append(mainArgs);
                         }
                     }
                     if (arguments.showVmArgs()) {
                         errorString = " -- jvm args information unavailable";
                         String jvmArgs = MonitoredVmUtil.jvmArgs(vm);
                         if (jvmArgs != null && jvmArgs.length() > 0) {
-                          output.append(" " + jvmArgs);
+                          output.append(' ').append(jvmArgs);
                         }
                     }
                     if (arguments.showVmFlags()) {
                         errorString = " -- jvm flags information unavailable";
                         String jvmFlags = MonitoredVmUtil.jvmFlags(vm);
                         if (jvmFlags != null && jvmFlags.length() > 0) {
-                            output.append(" " + jvmFlags);
+                            output.append(' ').append(jvmFlags);
                         }
                     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/RawOutputFormatter.java
--- a/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Mon Aug 11 21:07:58 2014 -0300
@@ -50,7 +50,7 @@
             StringBuilder headerBuilder = new StringBuilder();
             for (Iterator<Monitor> i = logged.iterator(); i.hasNext(); /* empty */ ) {
                 Monitor m = i.next();
-                headerBuilder.append(m.getName() + " ");
+                headerBuilder.append(m.getName()).append(' ');
             }
             header = headerBuilder.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/SyntaxException.java
--- a/src/share/classes/sun/tools/jstat/SyntaxException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/SyntaxException.java	Mon Aug 11 21:07:58 2014 -0300
@@ -65,7 +65,7 @@
     public SyntaxException(int lineno, Set<String> expected, Token found) {
         StringBuilder msg = new StringBuilder();
 
-        msg.append("Syntax error at line " + lineno + ": Expected one of \'");
+        msg.append("Syntax error at line ").append(lineno).append(": Expected one of \'");
 
         boolean first = true;
         for (Iterator<String> i = expected.iterator(); i.hasNext(); /* empty */) {
@@ -74,11 +74,11 @@
                 msg.append(keyWord);
                 first = false;
             } else {
-                msg.append("|" + keyWord);
+                msg.append('|').append(keyWord);
             }
         }
 
-        msg.append("\', Found " + found.toMessage());
+        msg.append("\', Found ").append(found.toMessage());
         message = msg.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/Token.java
--- a/src/share/classes/sun/tools/jstat/Token.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/Token.java	Mon Aug 11 21:07:58 2014 -0300
@@ -89,18 +89,18 @@
             sb.append("ttype=TT_EOF");
             break;
         case StreamTokenizer.TT_NUMBER:
-            sb.append("ttype=TT_NUM,").append("nval="+nval);
+            sb.append("ttype=TT_NUM,").append("nval=").append(nval);
             break;
         case StreamTokenizer.TT_WORD:
             if (sval == null) {
                 sb.append("ttype=TT_WORD:IDENTIFIER");
             } else {
-                sb.append("ttype=TT_WORD:").append("sval="+sval);
+                sb.append("ttype=TT_WORD:").append("sval=").append(sval);
             }
             break;
         default:
             if (ttype == (int)'"') {
-                sb.append("ttype=TT_STRING:").append("sval="+sval);
+                sb.append("ttype=TT_STRING:").append("sval=").append(sval);
             } else {
                 sb.append("ttype=TT_CHAR:").append((char)ttype);
             }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstatd/RemoteHostImpl.java
--- a/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Mon Aug 11 21:07:58 2014 -0300
@@ -68,7 +68,7 @@
 
         sb.append("local://").append(lvmid).append("@localhost");
         if (mode != null) {
-            sb.append("?mode=" + mode);
+            sb.append("?mode=").append(mode);
         }
 
         String vmidStr = sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/security/acl/AclEntryImpl.java
--- a/src/share/classes/sun/security/acl/AclEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/acl/AclEntryImpl.java	Mon Aug 11 21:07:58 2014 -0300
@@ -137,26 +137,30 @@
     /**
      * Return a string representation of  the contents of the ACL entry.
      */
-    public String toString() {
-        StringBuffer s = new StringBuffer();
-        if (negative)
-          s.append("-");
-        else
-          s.append("+");
-        if (user instanceof Group)
-            s.append("Group.");
-        else
-            s.append("User.");
-        s.append(user + "=");
-        Enumeration<Permission> e = permissions();
-        while(e.hasMoreElements()) {
-            Permission p = e.nextElement();
-            s.append(p);
-            if (e.hasMoreElements())
-                s.append(",");
-        }
-        return new String(s);
-    }
+	public String toString() {
+		StringBuffer sb = new StringBuffer();
+		if (negative) {
+			sb.append('-');
+		} else {
+			sb.append('+');
+		}
+		if (user instanceof Group) {
+			sb.append("Group.");
+		} else {
+			sb.append("User.");
+		}
+		sb.append(user).append('=');
+
+		Enumeration<Permission> e = permissions();
+		while (e.hasMoreElements()) {
+			Permission p = e.nextElement();
+			sb.append(p);
+			if (e.hasMoreElements()) {
+				sb.append(',');
+			}
+		}
+		return sb.toString();
+	}
 
     /**
      * Clones an AclEntry.
diff -r dde9f5cfde5f src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
--- a/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Mon Aug 11 21:07:58 2014 -0300
@@ -640,8 +640,7 @@
 
         for (int i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
--- a/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Mon Aug 11 21:07:58 2014 -0300
@@ -158,8 +158,8 @@
         }
         sb.append(hexDumper.encode(certHash));
         if (issuer != null && serialNumber != null) {
-            sb.append("\n\tIssuer: " + issuer + "\n");
-            sb.append("\t" + serialNumber);
+            sb.append("\n\tIssuer: ").append(issuer).append('\n');
+            sb.append('\t').append(serialNumber);
         }
         sb.append("\n]");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs11/P11KeyStore.java
--- a/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Mon Aug 11 21:07:58 2014 -0300
@@ -196,24 +196,24 @@
             } else if (type == ATTR_CLASS_CERT) {
                 sb.append("\ttype=[trusted cert]\n");
             }
-            sb.append("\tlabel=[" + label + "]\n");
+            sb.append("\tlabel=[").append(label).append("]\n");
             if (id == null) {
                 sb.append("\tid=[null]\n");
             } else {
-                sb.append("\tid=" + P11KeyStore.getID(id) + "\n");
+                sb.append("\tid=").append(P11KeyStore.getID(id)).append('\n');
             }
-            sb.append("\ttrusted=[" + trusted + "]\n");
-            sb.append("\tmatched=[" + matched + "]\n");
+            sb.append("\ttrusted=[").append(trusted).append("]\n");
+            sb.append("\tmatched=[").append(matched).append("]\n");
             if (cert == null) {
                 sb.append("\tcert=[null]\n");
             } else {
-                sb.append("\tcert=[\tsubject: " +
-                        cert.getSubjectX500Principal() +
-                        "\n\t\tissuer: " +
-                        cert.getIssuerX500Principal() +
-                        "\n\t\tserialNum: " +
-                        cert.getSerialNumber().toString() +
-                        "]");
+                sb.append("\tcert=[\tsubject: ")
+                        .append(cert.getSubjectX500Principal())
+                        .append("\n\t\tissuer: ")
+                        .append(cert.getIssuerX500Principal())
+                        .append("\n\t\tserialNum: ")
+                        .append(cert.getSerialNumber().toString())
+                        .append(']');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/PolicyFile.java
--- a/src/share/classes/sun/security/provider/PolicyFile.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/PolicyFile.java	Mon Aug 11 21:07:58 2014 -0300
@@ -1485,30 +1485,30 @@
         }
         int startIndex = 0;
         int v;
-        StringBuilder sb = new StringBuilder();
-        while ((v = sp.getSelfName().indexOf(SELF, startIndex)) != -1) {
+		StringBuilder sb = new StringBuilder();
+		while ((v = sp.getSelfName().indexOf(SELF, startIndex)) != -1) {
 
-            // add non-SELF string
-            sb.append(sp.getSelfName().substring(startIndex, v));
+			// add non-SELF string
+			sb.append(sp.getSelfName().substring(startIndex, v));
 
-            // expand SELF
-            Iterator<PolicyParser.PrincipalEntry> pli = entryPs.iterator();
-            while (pli.hasNext()) {
-                PolicyParser.PrincipalEntry pppe = pli.next();
-                String[][] principalInfo = getPrincipalInfo(pppe,pdp);
-                for (int i = 0; i < principalInfo.length; i++) {
-                    if (i != 0) {
-                        sb.append(", ");
-                    }
-                    sb.append(principalInfo[i][0] + " " +
-                        "\"" + principalInfo[i][1] + "\"");
-                }
-                if (pli.hasNext()) {
-                    sb.append(", ");
-                }
-            }
-            startIndex = v + SELF.length();
-        }
+			// expand SELF
+			Iterator<PolicyParser.PrincipalEntry> pli = entryPs.iterator();
+			while (pli.hasNext()) {
+				PolicyParser.PrincipalEntry pppe = pli.next();
+				String[][] principalInfo = getPrincipalInfo(pppe, pdp);
+				for (int i = 0; i < principalInfo.length; i++) {
+					if (i != 0) {
+						sb.append(", ");
+					}
+					sb.append(principalInfo[i][0]).append(' ').append('"')
+							.append(principalInfo[i][1]).append('"');
+				}
+				if (pli.hasNext()) {
+					sb.append(", ");
+				}
+			}
+			startIndex = v + SELF.length();
+		}
         // add remaining string (might be the entire string)
         sb.append(sp.getSelfName().substring(startIndex));
 
@@ -1774,17 +1774,17 @@
         Principal[] principals = pd.getPrincipals();
         String pals = "<no principals>";
         if (principals != null && principals.length > 0) {
-            StringBuilder palBuf = new StringBuilder("(principals ");
+            StringBuilder palSB = new StringBuilder("(principals ");
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                              " \"" + principals[i].getName() +
-                              "\"");
+                palSB.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append('"');
                 if (i < principals.length-1)
-                    palBuf.append(", ");
+                    palSB.append(", ");
                 else
-                    palBuf.append(")");
+                    palSB.append(')');
             }
-            pals = palBuf.toString();
+            pals = palSB.toString();
         }
         return "PD CodeSource: "
                 + pd.getCodeSource()
@@ -1884,7 +1884,7 @@
                     throw new Exception(form.format(source));
                 }
 
-                sb.append(X500PRINCIPAL + " \"" + suffix + "\"");
+                sb.append(X500PRINCIPAL).append(" \"").append(suffix).append('"');
                 startIndex = e+2;
             } else {
                 MessageFormat form = new MessageFormat
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/CertId.java
--- a/src/share/classes/sun/security/provider/certpath/CertId.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/CertId.java	Mon Aug 11 21:07:58 2014 -0300
@@ -223,13 +223,13 @@
     @Override public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CertId \n");
-        sb.append("Algorithm: " + hashAlgId.toString() +"\n");
+        sb.append("Algorithm: ").append(hashAlgId.toString()).append('\n');
         sb.append("issuerNameHash \n");
         HexDumpEncoder encoder = new HexDumpEncoder();
         sb.append(encoder.encode(issuerNameHash));
         sb.append("\nissuerKeyHash: \n");
         sb.append(encoder.encode(issuerKeyHash));
-        sb.append("\n" +  certSerialNumber.toString());
+        sb.append('\n').append(certSerialNumber.toString());
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/OCSPResponse.java
--- a/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Mon Aug 11 21:07:58 2014 -0300
@@ -812,14 +812,14 @@
             StringBuilder sb = new StringBuilder();
             sb.append("SingleResponse:  \n");
             sb.append(certId);
-            sb.append("\nCertStatus: "+ certStatus + "\n");
+            sb.append("\nCertStatus: ").append(certStatus).append('\n');
             if (certStatus == CertStatus.REVOKED) {
-                sb.append("revocationTime is " + revocationTime + "\n");
-                sb.append("revocationReason is " + revocationReason + "\n");
+                sb.append("revocationTime is ").append(revocationTime).append('\n');
+                sb.append("revocationReason is ").append(revocationReason).append('\n');
             }
-            sb.append("thisUpdate is " + thisUpdate + "\n");
+            sb.append("thisUpdate is ").append(thisUpdate).append('\n');
             if (nextUpdate != null) {
-                sb.append("nextUpdate is " + nextUpdate + "\n");
+                sb.append("nextUpdate is ").append(nextUpdate).append('\n');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
--- a/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Mon Aug 11 21:07:58 2014 -0300
@@ -124,7 +124,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Build Forward Flag: " + String.valueOf(buildForward) + "\n");
+        sb.append("  Build Forward Flag: ").append(String.valueOf(buildForward)).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/HandshakeMessage.java
--- a/src/share/classes/sun/security/ssl/HandshakeMessage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/HandshakeMessage.java	Mon Aug 11 21:07:58 2014 -0300
@@ -1478,7 +1478,7 @@
                 boolean opened = false;
                 for (SignatureAndHashAlgorithm signAlg : algorithms) {
                     if (opened) {
-                        sb.append(", " + signAlg.getAlgorithmName());
+                        sb.append(", ").append(signAlg.getAlgorithmName());
                     } else {
                         sb.append(signAlg.getAlgorithmName());
                         opened = true;
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/ServerNameExtension.java
--- a/src/share/classes/sun/security/ssl/ServerNameExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/ServerNameExtension.java	Mon Aug 11 21:07:58 2014 -0300
@@ -267,11 +267,11 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
+        sb.append("Extension ").append(type).append(", server_name: ");
         for (SNIServerName sniName : sniMap.values()) {
-            sb.append("[" + sniName + "]");
+            sb.append('[').append(sniName).append(']');
         }
-
-        return "Extension " + type + ", server_name: " + sb;
+        return sb.toString();
     }
 
     private static class UnknownServerName extends SNIServerName {
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
--- a/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Mon Aug 11 21:07:58 2014 -0300
@@ -119,17 +119,17 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
+        sb.append("Extension ").append(type).append(", signature_algorithms: ");
         boolean opened = false;
         for (SignatureAndHashAlgorithm signAlg : algorithms) {
             if (opened) {
-                sb.append(", " + signAlg.getAlgorithmName());
+                sb.append(", ").append(signAlg.getAlgorithmName());
             } else {
                 sb.append(signAlg.getAlgorithmName());
                 opened = true;
             }
         }
-
-        return "Extension " + type + ", signature_algorithms: " + sb;
+        return  sb.toString();
     }
 }
 
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
--- a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Mon Aug 11 21:07:58 2014 -0300
@@ -112,37 +112,37 @@
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Extension " + type + ", curve names: {");
-        boolean first = true;
-        for (int curveId : curveIds) {
-            if (first) {
-                first = false;
-            } else {
-                sb.append(", ");
-            }
-            // first check if it is a known named curve, then try other cases.
-            String oid = getCurveOid(curveId);
-            if (oid != null) {
-                ECParameterSpec spec = JsseJce.getECParameterSpec(oid);
-                // this toString() output will look nice for the current
-                // implementation of the ECParameterSpec class in the Sun
-                // provider, but may not look good for other implementations.
-                if (spec != null) {
-                    sb.append(spec.toString().split(" ")[0]);
-                } else {
-                    sb.append(oid);
-                }
-            } else if (curveId == ARBITRARY_PRIME) {
-                sb.append("arbitrary_explicit_prime_curves");
-            } else if (curveId == ARBITRARY_CHAR2) {
-                sb.append("arbitrary_explicit_char2_curves");
-            } else {
-                sb.append("unknown curve " + curveId);
-            }
-        }
-        sb.append("}");
-        return sb.toString();
+		StringBuilder sb = new StringBuilder();
+		sb.append("Extension ").append(type).append(", curve names: {");
+		boolean first = true;
+		for (int curveId : curveIds) {
+			if (first) {
+				first = false;
+			} else {
+				sb.append(", ");
+			}
+			// first check if it is a known named curve, then try other cases.
+			String oid = getCurveOid(curveId);
+			if (oid != null) {
+				ECParameterSpec spec = JsseJce.getECParameterSpec(oid);
+				// this toString() output will look nice for the current
+				// implementation of the ECParameterSpec class in the Sun
+				// provider, but may not look good for other implementations.
+				if (spec != null) {
+					sb.append(spec.toString().split(" ")[0]);
+				} else {
+					sb.append(oid);
+				}
+			} else if (curveId == ARBITRARY_PRIME) {
+				sb.append("arbitrary_explicit_prime_curves");
+			} else if (curveId == ARBITRARY_CHAR2) {
+				sb.append("arbitrary_explicit_char2_curves");
+			} else {
+				sb.append("unknown curve ").append(curveId);
+			}
+		}
+		sb.append("}");
+		return sb.toString();
     }
 
     // Test whether we support the curve with the given index.
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/jarsigner/Main.java
--- a/src/share/classes/sun/security/tools/jarsigner/Main.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/jarsigner/Main.java	Mon Aug 11 21:07:58 2014 -0300
@@ -676,14 +676,13 @@
                             ((man.getAttributes(name) != null) ||
                              (man.getAttributes("./"+name) != null) ||
                              (man.getAttributes("/"+name) != null));
-                        sb.append(
-                          (isSigned ? rb.getString("s") : rb.getString("SPACE")) +
-                          (inManifest ? rb.getString("m") : rb.getString("SPACE")) +
-                          (inStore ? rb.getString("k") : rb.getString("SPACE")) +
-                          (inScope ? rb.getString("i") : rb.getString("SPACE")) +
-                          ((inStoreOrScope & NOT_ALIAS) != 0 ?"X":" ") +
-                          rb.getString("SPACE"));
-                        sb.append("|");
+                        sb.append(isSigned ? rb.getString("s") : rb.getString("SPACE"))
+                                .append(inManifest ? rb.getString("m") : rb.getString("SPACE"))
+                                .append(inStore ? rb.getString("k") : rb.getString("SPACE"))
+                                .append(inScope ? rb.getString("i") : rb.getString("SPACE"))
+                                .append((inStoreOrScope & NOT_ALIAS) != 0 ? 'X' : ' ')
+                                .append(rb.getString("SPACE"));
+                        sb.append('|');
                     }
 
                     // When -certs provided, display info has extra empty
@@ -704,11 +703,13 @@
                         // Print no info for unsigned entries when -verbose:all,
                         // to be consistent with old behavior.
                         if (signatureRelated(name)) {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Signature.related.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(
+                            		rb.getString(".Signature.related.entries."))
+                            		.append("\n\n");
                         } else {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Unsigned.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(
+                            		rb.getString(".Unsigned.entries."))
+                            		.append("\n\n");
                         }
                     }
 
@@ -1605,8 +1606,8 @@
                 // No more warning, we alreay have hasExpiredCert or notYetValidCert
             } else {
                 chainNotValidated = true;
-                sb.append(tab + rb.getString(".CertPath.not.validated.") +
-                        e.getLocalizedMessage() + "]\n");   // TODO
+                sb.append(tab).append(rb.getString(".CertPath.not.validated."))
+                        .append(e.getLocalizedMessage()).append("]\n");   // TODO
             }
         }
         String result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/policytool/PolicyTool.java
--- a/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Mon Aug 11 21:07:58 2014 -0300
@@ -980,8 +980,9 @@
                                 grantEntry.principals.listIterator();
             while (list.hasNext()) {
                 PolicyParser.PrincipalEntry pppe = list.next();
-                sb.append(" Principal " + pppe.getDisplayClass() + " " +
-                    pppe.getDisplayName(true));
+                sb.append(" Principal ").append(pppe.getDisplayClass())
+                        .append(' ')
+                        .append(pppe.getDisplayName(true));
                 if (list.hasNext()) sb.append(", ");
             }
             result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/AVA.java
--- a/src/share/classes/sun/security/x509/AVA.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/AVA.java	Mon Aug 11 21:07:58 2014 -0300
@@ -1062,7 +1062,7 @@
             } else {
 
                 boolean quoteNeeded = false;
-                StringBuilder sbuffer = new StringBuilder();
+                StringBuilder sb = new StringBuilder();
                 boolean previousWhite = false;
                 final String escapees = ",+=\n<>#;\\\"";
 
@@ -1079,7 +1079,7 @@
                 for (int i = 0; i < length; i++) {
                     char c = valStr.charAt(i);
                     if (alreadyQuoted && (i == 0 || i == length - 1)) {
-                        sbuffer.append(c);
+                        sb.append(c);
                         continue;
                     }
                     if (DerValue.isPrintableStringChar(c) ||
@@ -1096,7 +1096,7 @@
                         if (!(c == ' ' || c == '\n')) {
                             // escape '"' and '\'
                             if (c == '"' || c == '\\') {
-                                sbuffer.append('\\');
+                                sb.append('\\');
                             }
                             previousWhite = false;
                         } else {
@@ -1106,7 +1106,7 @@
                             previousWhite = true;
                         }
 
-                        sbuffer.append(c);
+                        sb.append(c);
 
                     } else if (debug != null && Debug.isOn("ava")) {
 
@@ -1119,26 +1119,26 @@
                         byte[] valueBytes =
                                 Character.toString(c).getBytes("UTF8");
                         for (int j = 0; j < valueBytes.length; j++) {
-                            sbuffer.append('\\');
+                            sb.append('\\');
                             char hexChar = Character.forDigit
                                         (0xF & (valueBytes[j] >>> 4), 16);
-                            sbuffer.append(Character.toUpperCase(hexChar));
+                            sb.append(Character.toUpperCase(hexChar));
                             hexChar = Character.forDigit
                                         (0xF & (valueBytes[j]), 16);
-                            sbuffer.append(Character.toUpperCase(hexChar));
+                            sb.append(Character.toUpperCase(hexChar));
                         }
                     } else {
 
                         // append non-printable/non-escaped char
 
                         previousWhite = false;
-                        sbuffer.append(c);
+                        sb.append(c);
                     }
                 }
 
                 // quote if trailing whitespace
-                if (sbuffer.length() > 0) {
-                    char trailChar = sbuffer.charAt(sbuffer.length() - 1);
+                if (sb.length() > 0) {
+                    char trailChar = sb.charAt(sb.length() - 1);
                     if (trailChar == ' ' || trailChar == '\n') {
                         quoteNeeded = true;
                     }
@@ -1147,9 +1147,9 @@
                 // Emit the string ... quote it if needed
                 // if string is already quoted, don't re-quote
                 if (!alreadyQuoted && quoteNeeded) {
-                    retval.append("\"" + sbuffer.toString() + "\"");
+                    retval.append('"').append(sb.toString()).append('"');
                 } else {
-                    retval.append(sbuffer.toString());
+                    retval.append(sb.toString());
                 }
             }
         } catch (IOException e) {
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPoint.java
--- a/src/share/classes/sun/security/x509/DistributionPoint.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPoint.java	Mon Aug 11 21:07:58 2014 -0300
@@ -381,22 +381,22 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPoint:\n     " + fullName + "\n");
+            sb.append("DistributionPoint:\n     ").append(fullName).append('\n');
         }
         if (relativeName != null) {
-            sb.append("DistributionPoint:\n     " + relativeName + "\n");
+            sb.append("DistributionPoint:\n     ").append(relativeName).append('\n');
         }
 
         if (reasonFlags != null) {
             sb.append("   ReasonFlags:\n");
             for (int i = 0; i < reasonFlags.length; i++) {
                 if (reasonFlags[i]) {
-                    sb.append("    " + reasonToString(i) + "\n");
+                    sb.append("    ").append(reasonToString(i)).append('\n');
                 }
             }
         }
         if (crlIssuer != null) {
-            sb.append("   CRLIssuer:" + crlIssuer + "\n");
+            sb.append("   CRLIssuer:").append(crlIssuer).append('\n');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPointName.java
--- a/src/share/classes/sun/security/x509/DistributionPointName.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPointName.java	Mon Aug 11 21:07:58 2014 -0300
@@ -231,10 +231,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPointName:\n     " + fullName + "\n");
+            sb.append("DistributionPointName:\n     ").append(fullName).append('\n');
 
         } else {
-            sb.append("DistributionPointName:\n     " + relativeName + "\n");
+            sb.append("DistributionPointName:\n     ").append(relativeName).append('\n');
         }
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/PolicyInformation.java
--- a/src/share/classes/sun/security/x509/PolicyInformation.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/PolicyInformation.java	Mon Aug 11 21:07:58 2014 -0300
@@ -258,9 +258,9 @@
      * Return a printable representation of the PolicyInformation.
      */
     public String toString() {
-        StringBuilder s = new StringBuilder("  [" + policyIdentifier.toString());
-        s.append(policyQualifiers + "  ]\n");
-        return s.toString();
+        StringBuilder sb = new StringBuilder("  [" + policyIdentifier.toString());
+        sb.append(policyQualifiers).append("  ]\n");
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLEntryImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Mon Aug 11 21:07:58 2014 -0300
@@ -292,17 +292,17 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append(serialNumber.toString());
-        sb.append("  On: " + revocationDate.toString());
+        sb.append("  On: ").append(revocationDate.toString());
         if (certIssuer != null) {
-            sb.append("\n    Certificate issuer: " + certIssuer);
+            sb.append("\n    Certificate issuer: ").append(certIssuer);
         }
         if (extensions != null) {
             Collection<Extension> allEntryExts = extensions.getAllExtensions();
             Extension[] exts = allEntryExts.toArray(new Extension[0]);
 
-            sb.append("\n    CRL Entry Extensions: " + exts.length);
+            sb.append("\n    CRL Entry Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n    [" + (i+1) + "]: ");
+                sb.append("\n    [").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -313,9 +313,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLImpl.java	Mon Aug 11 21:07:58 2014 -0300
@@ -537,31 +537,32 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("X.509 CRL v" + (version+1) + "\n");
+        sb.append("X.509 CRL v").append(version + 1).append('\n');
         if (sigAlgId != null)
-            sb.append("Signature Algorithm: " + sigAlgId.toString() +
-                  ", OID=" + (sigAlgId.getOID()).toString() + "\n");
+            sb.append("Signature Algorithm: ").append(sigAlgId.toString())
+                    .append(", OID=")
+                    .append((sigAlgId.getOID()).toString()).append('\n');
         if (issuer != null)
-            sb.append("Issuer: " + issuer.toString() + "\n");
+            sb.append("Issuer: ").append(issuer.toString()).append('\n');
         if (thisUpdate != null)
-            sb.append("\nThis Update: " + thisUpdate.toString() + "\n");
+            sb.append("\nThis Update: ").append(thisUpdate.toString()).append('\n');
         if (nextUpdate != null)
-            sb.append("Next Update: " + nextUpdate.toString() + "\n");
+            sb.append("Next Update: ").append(nextUpdate.toString()).append('\n');
         if (revokedList.isEmpty())
             sb.append("\nNO certificates have been revoked\n");
         else {
-            sb.append("\nRevoked Certificates: " + revokedList.size());
+            sb.append("\nRevoked Certificates: ").append(revokedList.size());
             int i = 1;
             for (X509CRLEntry entry: revokedList) {
-                sb.append("\n[" + i++ + "] " + entry.toString());
+                sb.append("\n[").append(i++).append("] ").append(entry.toString());
             }
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Object[] objs = allExts.toArray();
-            sb.append("\nCRL Extensions: " + objs.length);
+            sb.append("\nCRL Extensions: ").append(objs.length);
             for (int i = 0; i < objs.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = (Extension)objs[i];
                 try {
                    if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -572,9 +573,8 @@
                            out.putOctetString(extValue);
                            extValue = out.toByteArray();
                            HexDumpEncoder enc = new HexDumpEncoder();
-                           sb.append("Extension unknown: "
-                                     + "DER encoded OCTET string =\n"
-                                     + enc.encodeBuffer(extValue) + "\n");
+                           sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                   .append(enc.encodeBuffer(extValue)).append('\n');
                       }
                    } else
                        sb.append(ext.toString()); // sub-class exists
@@ -585,8 +585,7 @@
         }
         if (signature != null) {
             HexDumpEncoder encoder = new HexDumpEncoder();
-            sb.append("\nSignature:\n" + encoder.encodeBuffer(signature)
-                      + "\n");
+            sb.append("\nSignature:\n").append(encoder.encodeBuffer(signature)).append('\n');
         } else
             sb.append("NOT signed yet\n");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertImpl.java
--- a/src/share/classes/sun/security/x509/X509CertImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertImpl.java	Mon Aug 11 21:07:58 2014 -0300
@@ -802,11 +802,11 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append(info.toString() + "\n");
-        sb.append("  Algorithm: [" + algId.toString() + "]\n");
+        sb.append(info.toString()).append('\n');
+        sb.append("  Algorithm: [").append(algId.toString()).append("]\n");
 
         HexDumpEncoder encoder = new HexDumpEncoder();
-        sb.append("  Signature:\n" + encoder.encodeBuffer(signature));
+        sb.append("  Signature:\n").append(encoder.encodeBuffer(signature));
         sb.append("\n]");
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertInfo.java
--- a/src/share/classes/sun/security/x509/X509CertInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertInfo.java	Mon Aug 11 21:07:58 2014 -0300
@@ -298,27 +298,27 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append("  " + version.toString() + "\n");
-        sb.append("  Subject: " + subject.toString() + "\n");
-        sb.append("  Signature Algorithm: " + algId.toString() + "\n");
-        sb.append("  Key:  " + pubKey.toString() + "\n");
-        sb.append("  " + interval.toString() + "\n");
-        sb.append("  Issuer: " + issuer.toString() + "\n");
-        sb.append("  " + serialNum.toString() + "\n");
+        sb.append("  ").append(version.toString()).append('\n');
+        sb.append("  Subject: ").append(subject.toString()).append('\n');
+        sb.append("  Signature Algorithm: ").append(algId.toString()).append('\n');
+        sb.append("  Key:  ").append(pubKey.toString()).append('\n');
+        sb.append("  ").append(interval.toString()).append('\n');
+        sb.append("  Issuer: ").append(issuer.toString()).append('\n');
+        sb.append("  ").append(serialNum.toString()).append('\n');
 
         // optional v2, v3 extras
         if (issuerUniqueId != null) {
-            sb.append("  Issuer Id:\n" + issuerUniqueId.toString() + "\n");
+            sb.append("  Issuer Id:\n").append(issuerUniqueId.toString()).append('\n');
         }
         if (subjectUniqueId != null) {
-            sb.append("  Subject Id:\n" + subjectUniqueId.toString() + "\n");
+            sb.append("  Subject Id:\n").append(subjectUniqueId.toString()).append('\n');
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Extension[] exts = allExts.toArray(new Extension[0]);
-            sb.append("\nCertificate Extensions: " + exts.length);
+            sb.append("\nCertificate Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -329,9 +329,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
@@ -341,10 +340,10 @@
             }
             Map<String,Extension> invalid = extensions.getUnparseableExtensions();
             if (invalid.isEmpty() == false) {
-                sb.append("\nUnparseable certificate extensions: " + invalid.size());
+                sb.append("\nUnparseable certificate extensions: ").append(invalid.size());
                 int i = 1;
                 for (Extension ext : invalid.values()) {
-                    sb.append("\n[" + (i++) + "]: ");
+                    sb.append("\n[").append(i++).append("]: ");
                     sb.append(ext);
                 }
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
--- a/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Mon Aug 11 21:07:58 2014 -0300
@@ -463,12 +463,12 @@
 
     // ---------
 
-    private static void appendIfLiteralAddress(String addr, StringBuffer sb) {
+    private static void appendIfLiteralAddress(String addr, StringBuilder sb) {
         if (IPAddressUtil.isIPv4LiteralAddress(addr)) {
-            sb.append("dns://" + addr + " ");
+            sb.append("dns://").append(addr).append(' ');
         } else {
             if (IPAddressUtil.isIPv6LiteralAddress(addr)) {
-                sb.append("dns://[" + addr + "] ");
+                sb.append("dns://[").append(addr).append("] ");
             }
         }
     }
@@ -478,7 +478,7 @@
      *         corresponding to the supplied List of nameservers.
      */
     private static String createProviderURL(List<String> nsList) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (String s: nsList) {
             appendIfLiteralAddress(s, sb);
         }
@@ -491,7 +491,7 @@
      *         contained in the provided str.
      */
     private static String createProviderURL(String str) {
-        StringBuffer sb = new StringBuffer();
+    	StringBuilder sb = new StringBuilder();
         StringTokenizer st = new StringTokenizer(str, ",");
         while (st.hasMoreTokens()) {
             appendIfLiteralAddress(st.nextToken(), sb);
diff -r dde9f5cfde5f src/share/classes/sun/net/www/HeaderParser.java
--- a/src/share/classes/sun/net/www/HeaderParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/HeaderParser.java	Mon Aug 11 21:07:58 2014 -0300
@@ -220,21 +220,23 @@
 
     public String toString () {
         Iterator<String> k = keys();
-        StringBuffer sbuf = new StringBuffer();
-        sbuf.append ("{size="+asize+" nkeys="+nkeys+" ");
+        StringBuilder sb = new StringBuilder();
+		sb.append("{size=").append(asize).append(" nkeys=").append(nkeys)
+				.append(' ');
         for (int i=0; k.hasNext(); i++) {
             String key = k.next();
             String val = findValue (i);
             if (val != null && "".equals (val)) {
                 val = null;
             }
-            sbuf.append (" {"+key+(val==null?"":","+val)+"}");
+			sb.append(" {").append(key).append(val == null ? "" : "," + val)
+					.append('}');
             if (k.hasNext()) {
-                sbuf.append (",");
+                sb.append (',');
             }
         }
-        sbuf.append (" }");
-        return new String (sbuf);
+        sb.append (" }");
+        return new String (sb);
     }
 
     public int findInt(String k, int Default) {
diff -r dde9f5cfde5f src/share/classes/sun/net/www/MimeEntry.java
--- a/src/share/classes/sun/net/www/MimeEntry.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/MimeEntry.java	Mon Aug 11 21:07:58 2014 -0300
@@ -288,7 +288,7 @@
 
         int action = getAction();
         if (action != MimeEntry.UNKNOWN) {
-            sb.append("action=" + actionKeywords[action]);
+            sb.append("action=").append(actionKeywords[action]);
             needSeparator = true;
         }
 
@@ -297,7 +297,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("application=" + command);
+            sb.append("application=").append(command);
             needSeparator = true;
         }
 
@@ -305,7 +305,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("icon=" + getImageFileName());
+            sb.append("icon=").append(getImageFileName());
             needSeparator = true;
         }
 
@@ -314,7 +314,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("file_extensions=" + extensions);
+            sb.append("file_extensions=").append(extensions);
             needSeparator = true;
         }
 
@@ -323,7 +323,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("description=" + description);
+            sb.append("description=").append(description);
         }
 
         return sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/management/Agent.java
--- a/src/share/classes/sun/management/Agent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/Agent.java	Mon Aug 11 21:07:58 2014 -0300
@@ -502,7 +502,7 @@
         } else {
             StringBuilder message = new StringBuilder(params[0]);
             for (int i = 1; i < params.length; i++) {
-                message.append(" " + params[i]);
+                message.append(' ').append(params[i]);
             }
             error(key, message.toString());
         }
diff -r dde9f5cfde5f src/share/classes/sun/management/MappedMXBeanType.java
--- a/src/share/classes/sun/management/MappedMXBeanType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/MappedMXBeanType.java	Mon Aug 11 21:07:58 2014 -0300
@@ -289,7 +289,7 @@
             if (et.isPrimitive()) {
                 className = new StringBuilder(c.getName());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
@@ -385,7 +385,7 @@
             if (elementType instanceof Class && ((Class) elementType).isPrimitive()) {
                 className = new StringBuilder(gat.toString());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/launcher/LauncherHelper.java
--- a/src/share/classes/sun/launcher/LauncherHelper.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/launcher/LauncherHelper.java	Mon Aug 11 21:07:58 2014 -0300
@@ -369,10 +369,9 @@
     static void appendVmErgoMessage(boolean isServerClass, String vm) {
         outBuf = outBuf.append(getLocalizedMessage("java.launcher.ergo.message1",
                 vm));
-        outBuf = (isServerClass)
-             ? outBuf.append(",\n" +
-                getLocalizedMessage("java.launcher.ergo.message2") + "\n\n")
-             : outBuf.append(".\n\n");
+		outBuf = (isServerClass) ? outBuf.append(",\n")
+				.append(getLocalizedMessage("java.launcher.ergo.message2"))
+				.append("\n\n") : outBuf.append(".\n\n");
     }
 
     /**
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/font/AttributeValues.java
--- a/src/share/classes/sun/font/AttributeValues.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/AttributeValues.java	Mon Aug 11 21:07:57 2014 -0300
@@ -542,7 +542,7 @@
                 }
             }
         }
-        b.append("[btx=" + baselineTransform + ", ctx=" + charTransform + "]");
+        b.append("[btx=").append(baselineTransform).append(", ctx=").append(charTransform).append(']');
         b.append('}');
         return b.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/font/Decoration.java
--- a/src/share/classes/sun/font/Decoration.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/Decoration.java	Mon Aug 11 21:07:57 2014 -0300
@@ -431,12 +431,12 @@
             StringBuilder sb = new StringBuilder();
             sb.append(super.toString());
             sb.append("[");
-            if (fgPaint != null) sb.append("fgPaint: " + fgPaint);
-            if (bgPaint != null) sb.append(" bgPaint: " + bgPaint);
+            if (fgPaint != null) sb.append("fgPaint: ").append(fgPaint);
+            if (bgPaint != null) sb.append(" bgPaint: ").append(bgPaint);
             if (swapColors) sb.append(" swapColors: true");
             if (strikethrough) sb.append(" strikethrough: true");
-            if (stdUnderline != null) sb.append(" stdUnderline: " + stdUnderline);
-            if (imUnderline != null) sb.append(" imUnderline: " + imUnderline);
+            if (stdUnderline != null) sb.append(" stdUnderline: ").append(stdUnderline);
+            if (imUnderline != null) sb.append(" imUnderline: ").append(imUnderline);
             sb.append("]");
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/font/StandardGlyphVector.java
--- a/src/share/classes/sun/font/StandardGlyphVector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/StandardGlyphVector.java	Mon Aug 11 21:07:57 2014 -0300
@@ -1894,9 +1894,9 @@
             }
         }
         catch(Exception e) {
-            buf.append(" " + e.getMessage());
+            buf.append(' ').append(e.getMessage());
         }
-        buf.append("}");
+        buf.append('}');
 
         return buf;
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/swing/GroupLayout.java
--- a/src/share/classes/javax/swing/GroupLayout.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/GroupLayout.java	Mon Aug 11 21:07:57 2014 -0300
@@ -1213,15 +1213,15 @@
             registerComponents(horizontalGroup, HORIZONTAL);
             registerComponents(verticalGroup, VERTICAL);
         }
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("HORIZONTAL\n");
-        createSpringDescription(buffer, horizontalGroup, "  ", HORIZONTAL);
-        buffer.append("\nVERTICAL\n");
-        createSpringDescription(buffer, verticalGroup, "  ", VERTICAL);
-        return buffer.toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append("HORIZONTAL\n");
+        createSpringDescription(sb, horizontalGroup, "  ", HORIZONTAL);
+        sb.append("\nVERTICAL\n");
+        createSpringDescription(sb, verticalGroup, "  ", VERTICAL);
+        return sb.toString();
     }
 
-    private void createSpringDescription(StringBuffer buffer, Spring spring,
+    private void createSpringDescription(StringBuilder sb, Spring spring,
             String indent, int axis) {
         String origin = "";
         String padding = "";
@@ -1239,20 +1239,19 @@
             padding = ", userCreated=" + paddingSpring.getUserCreated() +
                     ", matches=" + paddingSpring.getMatchDescription();
         }
-        buffer.append(indent + spring.getClass().getName() + " " +
-                Integer.toHexString(spring.hashCode()) + " " +
-                origin +
-                ", size=" + spring.getSize() +
-                ", alignment=" + spring.getAlignment() +
-                " prefs=[" + spring.getMinimumSize(axis) +
-                " " + spring.getPreferredSize(axis) +
-                " " + spring.getMaximumSize(axis) +
-                padding + "]\n");
+		sb.append(indent).append(spring.getClass().getName()).append(' ')
+				.append(Integer.toHexString(spring.hashCode())).append(' ')
+				.append(origin).append(", size=").append(spring.getSize())
+				.append(", alignment=").append(spring.getAlignment())
+				.append(" prefs=[").append(spring.getMinimumSize(axis))
+				.append(' ').append(spring.getPreferredSize(axis)).append(' ')
+				.append(spring.getMaximumSize(axis)).append(padding)
+				.append("]\n");
         if (spring instanceof Group) {
             List<Spring> springs = ((Group)spring).springs;
             indent += "  ";
             for (int counter = 0; counter < springs.size(); counter++) {
-                createSpringDescription(buffer, springs.get(counter), indent,
+                createSpringDescription(sb, springs.get(counter), indent,
                         axis);
             }
         }
diff -r dde9f5cfde5f src/share/classes/javax/swing/JColorChooser.java
--- a/src/share/classes/javax/swing/JColorChooser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/JColorChooser.java	Mon Aug 11 21:07:57 2014 -0300
@@ -542,19 +542,19 @@
      *
      * @return  a string representation of this <code>JColorChooser</code>
      */
-    protected String paramString() {
-        StringBuilder chooserPanelsString = new StringBuilder("");
-        for (int i=0; i<chooserPanels.length; i++) {
-            chooserPanelsString.append("[" + chooserPanels[i].toString()
-                                       + "]");
-        }
-        String previewPanelString = (previewPanel != null ?
-                                     previewPanel.toString() : "");
+	protected String paramString() {
+		StringBuilder chooserPanelsString = new StringBuilder();
+		for (AbstractColorChooserPanel panel : chooserPanels) {
+			chooserPanelsString.append('[').append(panel.toString())
+					.append(']');
+		}
+		String previewPanelString = (previewPanel != null ? previewPanel
+				.toString() : "");
 
-        return super.paramString() +
-        ",chooserPanels=" + chooserPanelsString.toString() +
-        ",previewPanel=" + previewPanelString;
-    }
+		return super.paramString() + ",chooserPanels="
+				+ chooserPanelsString.toString() + ",previewPanel="
+				+ previewPanelString;
+	}
 
 /////////////////
 // Accessibility support
diff -r dde9f5cfde5f src/share/classes/javax/swing/MultiUIDefaults.java
--- a/src/share/classes/javax/swing/MultiUIDefaults.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/MultiUIDefaults.java	Mon Aug 11 21:07:57 2014 -0300
@@ -190,18 +190,18 @@
 
     @Override
     public synchronized String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("{");
-        Enumeration<?> keys = keys();
-        while (keys.hasMoreElements()) {
-            Object key = keys.nextElement();
-            sb.append(key + "=" + get(key) + ", ");
-        }
-        int length = sb.length();
-        if (length > 1) {
-            sb.delete(length-2, length);
-        }
-        sb.append("}");
-        return sb.toString();
+		StringBuilder sb = new StringBuilder();
+		sb.append("{");
+		Enumeration<?> keys = keys();
+		while (keys.hasMoreElements()) {
+			Object key = keys.nextElement();
+			sb.append(key).append('=').append(get(key)).append(", ");
+		}
+		int length = sb.length();
+		if (length > 1) {
+			sb.delete(length - 2, length);
+		}
+		sb.append('}');
+		return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/javax/swing/RepaintManager.java
--- a/src/share/classes/javax/swing/RepaintManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/RepaintManager.java	Mon Aug 11 21:07:57 2014 -0300
@@ -990,10 +990,7 @@
      * @return a String representation of this object
      */
     public synchronized String toString() {
-        StringBuilder sb = new StringBuilder();
-        if(dirtyComponents != null)
-            sb.append("" + dirtyComponents);
-        return sb.toString();
+		return dirtyComponents != null ? dirtyComponents.toString() : "";
     }
 
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/event/TreeModelEvent.java
--- a/src/share/classes/javax/swing/event/TreeModelEvent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/event/TreeModelEvent.java	Mon Aug 11 21:07:57 2014 -0300
@@ -294,21 +294,20 @@
     public String toString() {
         StringBuilder   sb = new StringBuilder();
 
-        sb.append(getClass().getName() + " " +
-                  Integer.toString(hashCode()));
+        sb.append(getClass().getName()).append(' ').append(Integer.toString(hashCode()));
         if(path != null)
-            sb.append(" path " + path);
+            sb.append(" path ").append(path);
         if(childIndices != null) {
             sb.append(" indices [ ");
             for(int counter = 0; counter < childIndices.length; counter++)
-                sb.append(Integer.toString(childIndices[counter])+ " ");
-            sb.append("]");
+                sb.append(Integer.toString(childIndices[counter])).append(' ');
+            sb.append(']');
         }
         if(children != null) {
             sb.append(" children [ ");
             for(int counter = 0; counter < children.length; counter++)
-                sb.append(children[counter] + " ");
-            sb.append("]");
+                sb.append(children[counter]).append(' ');
+            sb.append(']');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Mon Aug 11 21:07:57 2014 -0300
@@ -1330,8 +1330,8 @@
 
             for (Object obj : values) {
                 String val = ((obj == null) ? "" : obj.toString());
-                plainBuf.append(val + "\n");
-                htmlBuf.append("  <li>" + val + "\n");
+                plainBuf.append(val).append('\n');
+                htmlBuf.append("  <li>").append(val).append('\n');
             }
 
             // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicListUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Mon Aug 11 21:07:57 2014 -0300
@@ -2948,8 +2948,8 @@
                 for (int i = 0; i < values.length; i++) {
                     Object obj = values[i];
                     String val = ((obj == null) ? "" : obj.toString());
-                    plainStr.append(val + "\n");
-                    htmlStr.append("  <li>" + val + "\n");
+                    plainStr.append(val).append('\n');
+                    htmlStr.append("  <li>").append(val).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTableUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Mon Aug 11 21:07:57 2014 -0300
@@ -2230,11 +2230,11 @@
                     for (int col = 0; col < cols.length; col++) {
                         Object obj = table.getValueAt(rows[row], cols[col]);
                         String val = ((obj == null) ? "" : obj.toString());
-                        plainStr.append(val + "\t");
-                        htmlStr.append("  <td>" + val + "</td>\n");
+                        plainStr.append(val).append('\t');
+                        htmlStr.append("  <td>").append(val).append("</td>\n");
                     }
                     // we want a newline at the end of each line and not a tab
-                    plainStr.deleteCharAt(plainStr.length() - 1).append("\n");
+                    plainStr.deleteCharAt(plainStr.length() - 1).append('\t');
                     htmlStr.append("</tr>\n");
                 }
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Mon Aug 11 21:07:57 2014 -0300
@@ -3618,8 +3618,8 @@
                     boolean leaf = model.isLeaf(node);
                     String label = getDisplayString(path, true, leaf);
 
-                    plainStr.append(label + "\n");
-                    htmlStr.append("  <li>" + label + "\n");
+                    plainStr.append(label).append('\n');
+                    htmlStr.append("  <li>").append(label).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
--- a/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Mon Aug 11 21:07:57 2014 -0300
@@ -1160,15 +1160,15 @@
             rows = rowMapper.getRowsForPaths(selection);
         else
             rows = null;
-        sb.append(getClass().getName() + " " + hashCode() + " [ ");
+        sb.append(getClass().getName()).append(' ').append(hashCode()).append(" [ ");
         for(int counter = 0; counter < selCount; counter++) {
             if(rows != null)
-                sb.append(selection[counter].toString() + "@" +
-                          Integer.toString(rows[counter])+ " ");
+                sb.append(selection[counter].toString()).append('@')
+                        .append(Integer.toString(rows[counter])).append(' ');
             else
-                sb.append(selection[counter].toString() + " ");
+                sb.append(selection[counter].toString()).append(' ');
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/AudioFileFormat.java
--- a/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Mon Aug 11 21:07:57 2014 -0300
@@ -272,26 +272,25 @@
     @Override
     public String toString() {
 
-        StringBuffer buf = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         //$$fb2002-11-01: fix for 4672864: AudioFileFormat.toString() throws unexpected NullPointerException
         if (type != null) {
-            buf.append(type.toString() + " (." + type.getExtension() + ") file");
+            sb.append(type.toString()).append(" (.").append(type.getExtension()).append(") file");
         } else {
-            buf.append("unknown file format");
+            sb.append("unknown file format");
         }
 
         if (byteLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", byte length: " + byteLength);
+            sb.append(", byte length: ").append(byteLength);
         }
 
-        buf.append(", data format: " + format);
+        sb.append(", data format: ").append(format);
 
         if (frameLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", frame length: " + frameLength);
+            sb.append(", frame length: ").append(frameLength);
         }
-
-        return new String(buf);
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/DataLine.java
--- a/src/share/classes/javax/sound/sampled/DataLine.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/DataLine.java	Mon Aug 11 21:07:57 2014 -0300
@@ -473,17 +473,21 @@
             StringBuilder sb = new StringBuilder();
 
             if ( (formats.length == 1) && (formats[0] != null) ) {
-                sb.append(" supporting format " + formats[0]);
+                sb.append(" supporting format ").append(formats[0]);
             } else if (getFormats().length > 1) {
-                sb.append(" supporting " + getFormats().length + " audio formats");
+				sb.append(" supporting ").append(getFormats().length)
+						.append(" audio formats");
             }
 
             if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (maxBufferSize != AudioSystem.NOT_SPECIFIED) ) {
-                sb.append(", and buffers of " + minBufferSize + " to " + maxBufferSize + " bytes");
+				sb.append(", and buffers of ").append(minBufferSize)
+						.append(" to ").append(maxBufferSize).append(" bytes");
             } else if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (minBufferSize > 0) ) {
-                sb.append(", and buffers of at least " + minBufferSize + " bytes");
+				sb.append(", and buffers of at least ").append(minBufferSize)
+						.append(" bytes");
             } else if (maxBufferSize != AudioSystem.NOT_SPECIFIED) {
-                sb.append(", and buffers of up to " + minBufferSize + " bytes");
+				sb.append(", and buffers of up to ").append(minBufferSize)
+						.append(" bytes");
             }
 
             return new String(super.toString() + sb);
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
--- a/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Mon Aug 11 21:07:57 2014 -0300
@@ -651,8 +651,7 @@
         StringBuilder caddrString = new StringBuilder();
         if (clientAddresses != null) {
             for (int i = 0; i < clientAddresses.length; i++) {
-                caddrString.append("clientAddresses[" + i + "] = " +
-                        clientAddresses[i].toString());
+                caddrString.append("clientAddresses[").append(i).append("] = ").append(clientAddresses[i].toString());
             }
         }
         return ("Ticket (hex) = " + "\n" +
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/naming/BinaryRefAddr.java
--- a/src/share/classes/javax/naming/BinaryRefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/BinaryRefAddr.java	Mon Aug 11 21:07:57 2014 -0300
@@ -165,11 +165,11 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Address Type: " + addrType + "\n");
-
+        StringBuilder str = new StringBuilder();
+        str.append("Address Type: ").append(addrType).append('\n');
         str.append("AddressContents: ");
         for (int i = 0; i<buf.length && i < 32; i++) {
-            str.append(Integer.toHexString(buf[i]) +" ");
+            str.append(Integer.toHexString(buf[i])).append(' ');
         }
         if (buf.length >= 32)
             str.append(" ...\n");
diff -r dde9f5cfde5f src/share/classes/javax/naming/NameImpl.java
--- a/src/share/classes/javax/naming/NameImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/NameImpl.java	Mon Aug 11 21:07:57 2014 -0300
@@ -170,7 +170,7 @@
                 endQuote = one ? syntaxEndQuote1 : syntaxEndQuote2;
 
                 i += syntaxTypevalSeparator.length();
-                answer.append(syntaxTypevalSeparator+beginQuote); // add back
+                answer.append(syntaxTypevalSeparator).append(beginQuote); // add back
 
                 // consume string until matching quote
                 for (i += beginQuote.length();
diff -r dde9f5cfde5f src/share/classes/javax/naming/RefAddr.java
--- a/src/share/classes/javax/naming/RefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/RefAddr.java	Mon Aug 11 21:07:57 2014 -0300
@@ -139,9 +139,9 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Type: " + addrType + "\n");
-
-        str.append("Content: " + getContent() + "\n");
+        StringBuilder str = new StringBuilder();
+        str.append("Type: ").append(addrType).append('\n');
+        str.append("Content: ").append(getContent()).append('\n');
         return (str.toString());
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/crypto/CryptoPermission.java
--- a/src/share/classes/javax/crypto/CryptoPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/crypto/CryptoPermission.java	Mon Aug 11 21:07:56 2014 -0300
@@ -369,22 +369,24 @@
      * @return information about this CryptoPermission.
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder(100);
-        buf.append("(CryptoPermission " + alg + " " + maxKeySize);
+        StringBuilder sb = new StringBuilder(100);
+		sb.append("(CryptoPermission ").append(alg).append(' ')
+				.append(maxKeySize);
         if (algParamSpec != null) {
             if (algParamSpec instanceof RC2ParameterSpec) {
-                buf.append(" , effective " +
-                    ((RC2ParameterSpec)algParamSpec).getEffectiveKeyBits());
+				sb.append(" , effective ")
+						.append(((RC2ParameterSpec) algParamSpec)
+								.getEffectiveKeyBits());
             } else if (algParamSpec instanceof RC5ParameterSpec) {
-                buf.append(" , rounds " +
-                    ((RC5ParameterSpec)algParamSpec).getRounds());
+				sb.append(" , rounds ").append(
+						((RC5ParameterSpec) algParamSpec).getRounds());
             }
         }
         if (exemptionMechanism != null) { // OPTIONAL
-            buf.append(" " + exemptionMechanism);
+            sb.append(' ').append(exemptionMechanism);
         }
-        buf.append(")");
-        return buf.toString();
+        sb.append(')');
+        return sb.toString();
     }
 
     private boolean impliesExemptionMechanism(String exemptionMechanism) {
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/management/MBeanPermission.java
--- a/src/share/classes/javax/management/MBeanPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/MBeanPermission.java	Mon Aug 11 21:07:57 2014 -0300
@@ -455,11 +455,11 @@
         name.append(className);
         if (member == null)
             member = "-";
-        name.append("#" + member);
+        name.append('#').append(member);
         if (objectName == null)
             name.append("[-]");
         else
-            name.append("[").append(objectName.getCanonicalName()).append("]");
+            name.append('[').append(objectName.getCanonicalName()).append(']');
 
         /* In the interests of legibility for Permission.toString(), we
            transform the empty string into "*".  */
diff -r dde9f5cfde5f src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
--- a/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Mon Aug 11 21:07:57 2014 -0300
@@ -716,15 +716,14 @@
         }
 
         retStr.append("\nMBeanInfo for ModelMBean is:");
-        retStr.append("\nCLASSNAME: \t"+ info.getClassName());
-        retStr.append("\nDESCRIPTION: \t"+ info.getDescription());
+        retStr.append("\nCLASSNAME: \t").append(info.getClassName());
+        retStr.append("\nDESCRIPTION: \t").append(info.getDescription());
 
 
         try {
-            retStr.append("\nMBEAN DESCRIPTOR: \t"+
-                          info.getMBeanDescriptor());
+            retStr.append("\nMBEAN DESCRIPTOR: \t").append(info.getMBeanDescriptor());
         } catch (Exception e) {
-            retStr.append("\nMBEAN DESCRIPTOR: \t" + " is invalid");
+            retStr.append("\nMBEAN DESCRIPTOR: \t  is invalid");
         }
 
         retStr.append("\nATTRIBUTES");
@@ -734,13 +733,12 @@
             for (int i=0; i<attrInfo.length; i++) {
                 final ModelMBeanAttributeInfo attInfo =
                     (ModelMBeanAttributeInfo)attrInfo[i];
-                retStr.append(" ** NAME: \t"+ attInfo.getName());
-                retStr.append("    DESCR: \t"+ attInfo.getDescription());
-                retStr.append("    TYPE: \t"+ attInfo.getType() +
-                              "    READ: \t"+ attInfo.isReadable() +
-                              "    WRITE: \t"+ attInfo.isWritable());
-                retStr.append("    DESCRIPTOR: " +
-                              attInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(attInfo.getName());
+                retStr.append("    DESCR: \t").append(attInfo.getDescription());
+                retStr.append("    TYPE: \t").append(attInfo.getType())
+                        .append("    READ: \t").append(attInfo.isReadable())
+                        .append("    WRITE: \t").append(attInfo.isWritable());
+                retStr.append("    DESCRIPTOR: ").append(attInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No attributes **");
@@ -752,14 +750,12 @@
             for (int i=0; i<constrInfo.length; i++) {
                 final ModelMBeanConstructorInfo ctorInfo =
                     (ModelMBeanConstructorInfo)constrInfo[i];
-                retStr.append(" ** NAME: \t"+ ctorInfo.getName());
-                retStr.append("    DESCR: \t"+
-                              ctorInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              ctorInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              ctorInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(ctorInfo.getName());
+                retStr.append("    DESCR: \t").append(ctorInfo.getDescription());
+                retStr.append("    PARAM: \t").append(ctorInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ")
+                        .append(ctorInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No Constructors **");
@@ -771,13 +767,11 @@
             for (int i=0; i<opsInfo.length; i++) {
                 final ModelMBeanOperationInfo operInfo =
                     (ModelMBeanOperationInfo)opsInfo[i];
-                retStr.append(" ** NAME: \t"+ operInfo.getName());
-                retStr.append("    DESCR: \t"+ operInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              operInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              operInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(operInfo.getName());
+                retStr.append("    DESCR: \t").append(operInfo.getDescription());
+                retStr.append("    PARAM: \t").append(operInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ").append(operInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No operations ** ");
@@ -790,10 +784,9 @@
             for (int i=0; i<notifInfo.length; i++) {
                 final ModelMBeanNotificationInfo nInfo =
                     (ModelMBeanNotificationInfo)notifInfo[i];
-                retStr.append(" ** NAME: \t"+ nInfo.getName());
-                retStr.append("    DESCR: \t"+ nInfo.getDescription());
-                retStr.append("    DESCRIPTOR: " +
-                              nInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(nInfo.getName());
+                retStr.append("    DESCR: \t").append(nInfo.getDescription());
+                retStr.append("    DESCRIPTOR: ").append(nInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No notifications **");
diff -r dde9f5cfde5f src/share/classes/javax/management/openmbean/CompositeType.java
--- a/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/openmbean/CompositeType.java	Mon Aug 11 21:07:57 2014 -0300
@@ -463,7 +463,7 @@
                 result.append("(itemName=");
                 result.append(key);
                 result.append(",itemType=");
-                result.append(nameToType.get(key).toString() +")");
+                result.append(nameToType.get(key).toString()).append(')');
                 i++;
             }
             result.append("))");
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/Role.java
--- a/src/share/classes/javax/management/relation/Role.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/Role.java	Mon Aug 11 21:07:57 2014 -0300
@@ -225,19 +225,19 @@
      *
      * @return the description of the role.
      */
-    public String toString() {
-        StringBuilder result = new StringBuilder();
-        result.append("role name: " + name + "; role value: ");
-        for (Iterator<ObjectName> objNameIter = objectNameList.iterator();
-             objNameIter.hasNext();) {
-            ObjectName currObjName = objNameIter.next();
-            result.append(currObjName.toString());
-            if (objNameIter.hasNext()) {
-                result.append(", ");
-            }
-        }
-        return result.toString();
-    }
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("role name: ").append(name).append("; role value: ");
+		for (Iterator<ObjectName> objNameIter = objectNameList.iterator(); objNameIter
+				.hasNext();) {
+			ObjectName currObjName = objNameIter.next();
+			sb.append(currObjName.toString());
+			if (objNameIter.hasNext()) {
+				sb.append(", ");
+			}
+		}
+		return sb.toString();
+	}
 
     //
     // Misc
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleInfo.java
--- a/src/share/classes/javax/management/relation/RoleInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleInfo.java	Mon Aug 11 21:07:57 2014 -0300
@@ -456,13 +456,13 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role info name: " + name);
-        result.append("; isReadable: " + isReadable);
-        result.append("; isWritable: " + isWritable);
-        result.append("; description: " + description);
-        result.append("; minimum degree: " + minDegree);
-        result.append("; maximum degree: " + maxDegree);
-        result.append("; MBean class: " + referencedMBeanClassName);
+        result.append("role info name: ").append(name);
+        result.append("; isReadable: ").append(isReadable);
+        result.append("; isWritable: ").append(isWritable);
+        result.append("; description: ").append(description);
+        result.append("; minimum degree: ").append(minDegree);
+        result.append("; maximum degree: ").append(maxDegree);
+        result.append("; MBean class: ").append(referencedMBeanClassName);
         return result.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleUnresolved.java
--- a/src/share/classes/javax/management/relation/RoleUnresolved.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleUnresolved.java	Mon Aug 11 21:07:57 2014 -0300
@@ -282,7 +282,7 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role name: " + roleName);
+        result.append("role name: ").append(roleName);
         if (roleValue != null) {
             result.append("; value: ");
             for (Iterator<ObjectName> objNameIter = roleValue.iterator();
@@ -294,7 +294,7 @@
                 }
             }
         }
-        result.append("; problem type: " + problemType);
+        result.append("; problem type: ").append(problemType);
         return result.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/util/Scanner.java
--- a/src/share/classes/java/util/Scanner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/Scanner.java	Mon Aug 11 21:07:56 2014 -0300
@@ -1304,20 +1304,20 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.Scanner");
-        sb.append("[delimiters=" + delimPattern + "]");
-        sb.append("[position=" + position + "]");
-        sb.append("[match valid=" + matchValid + "]");
-        sb.append("[need input=" + needInput + "]");
-        sb.append("[source closed=" + sourceClosed + "]");
-        sb.append("[skipped=" + skipped + "]");
-        sb.append("[group separator=" + groupSeparator + "]");
-        sb.append("[decimal separator=" + decimalSeparator + "]");
-        sb.append("[positive prefix=" + positivePrefix + "]");
-        sb.append("[negative prefix=" + negativePrefix + "]");
-        sb.append("[positive suffix=" + positiveSuffix + "]");
-        sb.append("[negative suffix=" + negativeSuffix + "]");
-        sb.append("[NaN string=" + nanString + "]");
-        sb.append("[infinity string=" + infinityString + "]");
+        sb.append("[delimiters=").append(delimPattern).append(']');
+        sb.append("[position=").append(position).append(']');
+        sb.append("[match valid=").append(matchValid).append(']');
+        sb.append("[need input=").append(needInput).append(']');
+        sb.append("[source closed=").append(sourceClosed).append(']');
+        sb.append("[skipped=").append(skipped).append(']');
+        sb.append("[group separator=").append(groupSeparator).append(']');
+        sb.append("[decimal separator=").append(decimalSeparator).append(']');
+        sb.append("[positive prefix=").append(positivePrefix).append(']');
+        sb.append("[negative prefix=").append(negativePrefix).append(']');
+        sb.append("[positive suffix=").append(positiveSuffix).append(']');
+        sb.append("[negative suffix=").append(negativeSuffix).append(']');
+        sb.append("[NaN string=").append(nanString).append(']');
+        sb.append("[infinity string=").append(infinityString).append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Matcher.java
--- a/src/share/classes/java/util/regex/Matcher.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Matcher.java	Mon Aug 11 21:07:56 2014 -0300
@@ -1295,14 +1295,14 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.regex.Matcher");
-        sb.append("[pattern=" + pattern());
+        sb.append("[pattern=").append(pattern());
         sb.append(" region=");
-        sb.append(regionStart() + "," + regionEnd());
+        sb.append(regionStart()).append(',').append(regionEnd());
         sb.append(" lastmatch=");
         if ((first >= 0) && (group() != null)) {
             sb.append(group());
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Pattern.java
--- a/src/share/classes/java/util/regex/Pattern.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Pattern.java	Mon Aug 11 21:07:56 2014 -0300
@@ -1488,10 +1488,10 @@
         for(int x=0; x<perms.length; x++) {
             String next = base + perms[x];
             if (x>0)
-                result.append("|"+next);
+                result.append('|').append(next);
             next = composeOneStep(next);
             if (next != null)
-                result.append("|"+produceEquivalentAlternation(next));
+                result.append('|').append(produceEquivalentAlternation(next));
         }
         return result.toString();
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/text/ChoiceFormat.java
--- a/src/share/classes/java/text/ChoiceFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/text/ChoiceFormat.java	Mon Aug 11 21:07:56 2014 -0300
@@ -272,7 +272,7 @@
             double tryLess = Math.abs(Math.IEEEremainder(less, 1.0d));
 
             if (tryLessOrEqual < tryLess) {
-                result.append(""+choiceLimits[i]);
+                result.append(choiceLimits[i]);
                 result.append('#');
             } else {
                 if (choiceLimits[i] == Double.POSITIVE_INFINITY) {
@@ -280,7 +280,7 @@
                 } else if (choiceLimits[i] == Double.NEGATIVE_INFINITY) {
                     result.append("-\u221E");
                 } else {
-                    result.append(""+less);
+                    result.append(less);
                 }
                 result.append('<');
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSigner.java
--- a/src/share/classes/java/security/CodeSigner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSigner.java	Mon Aug 11 21:07:56 2014 -0300
@@ -156,9 +156,9 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("Signer: " + signerCertPath.getCertificates().get(0));
+        sb.append("Signer: ").append(signerCertPath.getCertificates().get(0));
         if (timestamp != null) {
-            sb.append("timestamp: " + timestamp);
+            sb.append("timestamp: ").append(timestamp);
         }
         sb.append(")");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSource.java
--- a/src/share/classes/java/security/CodeSource.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSource.java	Mon Aug 11 21:07:56 2014 -0300
@@ -468,12 +468,12 @@
 
         if (this.certs != null && this.certs.length > 0) {
             for (int i = 0; i < this.certs.length; i++) {
-                sb.append( " " + this.certs[i]);
+                sb.append(' ').append(this.certs[i]);
             }
 
         } else if (this.signers != null && this.signers.length > 0) {
             for (int i = 0; i < this.signers.length; i++) {
-                sb.append( " " + this.signers[i]);
+                sb.append(' ').append(this.signers[i]);
             }
         } else {
             sb.append(" <no signer certificates>");
diff -r dde9f5cfde5f src/share/classes/java/security/KeyStore.java
--- a/src/share/classes/java/security/KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/KeyStore.java	Mon Aug 11 21:07:56 2014 -0300
@@ -610,8 +610,8 @@
          */
         public String toString() {
             StringBuilder sb = new StringBuilder();
-            sb.append("Private key entry and certificate chain with "
-                + chain.length + " elements:\r\n");
+			sb.append("Private key entry and certificate chain with ")
+					.append(chain.length).append(" elements:\r\n");
             for (Certificate cert : chain) {
                 sb.append(cert);
                 sb.append("\r\n");
diff -r dde9f5cfde5f src/share/classes/java/security/PermissionCollection.java
--- a/src/share/classes/java/security/PermissionCollection.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/PermissionCollection.java	Mon Aug 11 21:07:56 2014 -0300
@@ -176,20 +176,20 @@
      *         as described above.
      *
      */
-    public String toString() {
-        Enumeration<Permission> enum_ = elements();
-        StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()+" (\n");
-        while (enum_.hasMoreElements()) {
-            try {
-                sb.append(" ");
-                sb.append(enum_.nextElement().toString());
-                sb.append("\n");
-            } catch (NoSuchElementException e){
-                // ignore
-            }
-        }
-        sb.append(")\n");
-        return sb.toString();
-    }
+	public String toString() {
+		Enumeration<Permission> enum_ = elements();
+		StringBuilder sb = new StringBuilder();
+		sb.append(super.toString()).append(" (\n");
+		while (enum_.hasMoreElements()) {
+			try {
+				sb.append(' ');
+				sb.append(enum_.nextElement().toString());
+				sb.append('\n');
+			} catch (NoSuchElementException e) {
+				// ignore
+			}
+		}
+		sb.append(")\n");
+		return sb.toString();
+	}
 }
diff -r dde9f5cfde5f src/share/classes/java/security/ProtectionDomain.java
--- a/src/share/classes/java/security/ProtectionDomain.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/ProtectionDomain.java	Mon Aug 11 21:07:56 2014 -0300
@@ -285,34 +285,32 @@
     /**
      * Convert a ProtectionDomain to a String.
      */
-    @Override public String toString() {
-        String pals = "<no principals>";
-        if (principals != null && principals.length > 0) {
-            StringBuilder palBuf = new StringBuilder("(principals ");
+	@Override
+	public String toString() {
+		String pals = "<no principals>";
+		if (principals != null && principals.length > 0) {
+			StringBuilder palBuilder = new StringBuilder("(principals ");
 
-            for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                            " \"" + principals[i].getName() +
-                            "\"");
-                if (i < principals.length-1)
-                    palBuf.append(",\n");
-                else
-                    palBuf.append(")\n");
-            }
-            pals = palBuf.toString();
-        }
+			for (int i = 0; i < principals.length; i++) {
+				palBuilder.append(principals[i].getClass().getName())
+						.append(" \"").append(principals[i].getName())
+						.append('"');
+				if (i < principals.length - 1) {
+					palBuilder.append(",\n");
+				} else {
+					palBuilder.append(")\n");
+				}
+			}
+			pals = palBuilder.toString();
+		}
 
-        // Check if policy is set; we don't want to load
-        // the policy prematurely here
-        PermissionCollection pc = Policy.isSet() && seeAllp() ?
-                                      mergePermissions():
-                                      getPermissions();
+		// Check if policy is set; we don't want to load
+		// the policy prematurely here
+		PermissionCollection pc = Policy.isSet() && seeAllp() ? mergePermissions()
+				: getPermissions();
 
-        return "ProtectionDomain "+
-            " "+codesource+"\n"+
-            " "+classloader+"\n"+
-            " "+pals+"\n"+
-            " "+pc+"\n";
+		return "ProtectionDomain " + " " + codesource + "\n" + " "
+				+ classloader + "\n" + " " + pals + "\n" + " " + pc + "\n";
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/java/security/Timestamp.java
--- a/src/share/classes/java/security/Timestamp.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/Timestamp.java	Mon Aug 11 21:07:56 2014 -0300
@@ -143,10 +143,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("timestamp: " + timestamp);
+        sb.append("timestamp: ").append(timestamp);
         List<? extends Certificate> certs = signerCertPath.getCertificates();
         if (!certs.isEmpty()) {
-            sb.append("TSA: " + certs.get(0));
+            sb.append("TSA: ").append(certs.get(0));
         } else {
             sb.append("TSA: <empty>");
         }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CertPath.java
--- a/src/share/classes/java/security/cert/CertPath.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CertPath.java	Mon Aug 11 21:07:56 2014 -0300
@@ -219,28 +219,24 @@
      *
      * @return a string representation of this certification path
      */
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        Iterator<? extends Certificate> stringIterator =
-                                        getCertificates().iterator();
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
 
-        sb.append("\n" + type + " Cert Path: length = "
-            + getCertificates().size() + ".\n");
-        sb.append("[\n");
-        int i = 1;
-        while (stringIterator.hasNext()) {
-            sb.append("=========================================="
-                + "===============Certificate " + i + " start.\n");
-            Certificate stringCert = stringIterator.next();
-            sb.append(stringCert.toString());
-            sb.append("\n========================================"
-                + "=================Certificate " + i + " end.\n\n\n");
-            i++;
-        }
+		sb.append('\n').append(type).append(" Cert Path: length = ")
+			.append(getCertificates().size()).append(".\n").append("[\n");
+		int i = 1;
+		for (Certificate stringCert : getCertificates()) {
+			sb.append("=========================================="
+			 + "===============Certificate ").append(i).append(" start.\n");
+			sb.append(stringCert.toString());
+			sb.append("\n========================================"
+			 + "=================Certificate ").append(i).append(" end.\n\n\n");
+			i++;
+		}
 
-        sb.append("\n]");
-        return sb.toString();
-    }
+		sb.append("\n]");
+		return sb.toString();
+	}
 
     /**
      * Returns the encoded form of this certification path, using the default
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CollectionCertStoreParameters.java
--- a/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Mon Aug 11 21:07:56 2014 -0300
@@ -134,8 +134,8 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CollectionCertStoreParameters: [\n");
-        sb.append("  collection: " + coll + "\n");
-        sb.append("]");
+        sb.append("  collection: ").append(coll).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/LDAPCertStoreParameters.java
--- a/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Mon Aug 11 21:07:56 2014 -0300
@@ -141,9 +141,9 @@
         StringBuilder sb = new StringBuilder();
         sb.append("LDAPCertStoreParameters: [\n");
 
-        sb.append("  serverName: " + serverName + "\n");
-        sb.append("  port: " + port + "\n");
-        sb.append("]");
+        sb.append("  serverName: ").append(serverName).append('\n');
+        sb.append("  port: ").append(port).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXBuilderParameters.java
--- a/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Mon Aug 11 21:07:56 2014 -0300
@@ -192,7 +192,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Maximum Path Length: " + maxPathLength + "\n");
+        sb.append("  Maximum Path Length: ").append(maxPathLength).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Mon Aug 11 21:07:56 2014 -0300
@@ -108,12 +108,14 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("PKIXCertPathBuilderResult: [\n");
-        sb.append("  Certification Path: " + certPath + "\n");
-        sb.append("  Trust Anchor: " + getTrustAnchor().toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(getPolicyTree()) + "\n");
-        sb.append("  Subject Public Key: " + getPublicKey() + "\n");
-        sb.append("]");
+		sb.append("PKIXCertPathBuilderResult: [\n");
+		sb.append("  Certification Path: ").append(certPath).append('\n');
+		sb.append("  Trust Anchor: ").append(getTrustAnchor().toString())
+				.append('\n');
+		sb.append("  Policy Tree: ").append(String.valueOf(getPolicyTree()))
+				.append('\n');
+		sb.append("  Subject Public Key: ").append(getPublicKey()).append('\n');
+		sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Mon Aug 11 21:07:56 2014 -0300
@@ -150,10 +150,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathValidatorResult: [\n");
-        sb.append("  Trust Anchor: " + trustAnchor.toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(policyTree) + "\n");
-        sb.append("  Subject Public Key: " + subjectPublicKey + "\n");
-        sb.append("]");
+        sb.append("  Trust Anchor: ").append(trustAnchor.toString()).append('\n');
+        sb.append("  Policy Tree: ").append(String.valueOf(policyTree)).append('\n');
+        sb.append("  Subject Public Key: ").append(subjectPublicKey).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXParameters.java
--- a/src/share/classes/java/security/cert/PKIXParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXParameters.java	Mon Aug 11 21:07:56 2014 -0300
@@ -698,8 +698,7 @@
 
         /* start with trusted anchor info */
         if (unmodTrustAnchors != null) {
-            sb.append("  Trust Anchors: " + unmodTrustAnchors.toString()
-                + "\n");
+            sb.append("  Trust Anchors: ").append(unmodTrustAnchors.toString()).append('\n');
         }
 
         /* now, append initial state information */
@@ -707,30 +706,37 @@
             if (unmodInitialPolicies.isEmpty()) {
                 sb.append("  Initial Policy OIDs: any\n");
             } else {
-                sb.append("  Initial Policy OIDs: ["
-                    + unmodInitialPolicies.toString() + "]\n");
+				sb.append("  Initial Policy OIDs: [")
+						.append(unmodInitialPolicies.toString()).append("]\n");
             }
         }
 
         /* now, append constraints on all certificates in the path */
-        sb.append("  Validity Date: " + String.valueOf(date) + "\n");
-        sb.append("  Signature Provider: " + String.valueOf(sigProvider) + "\n");
-        sb.append("  Default Revocation Enabled: " + revocationEnabled + "\n");
-        sb.append("  Explicit Policy Required: " + explicitPolicyRequired + "\n");
-        sb.append("  Policy Mapping Inhibited: " + policyMappingInhibited + "\n");
-        sb.append("  Any Policy Inhibited: " + anyPolicyInhibited + "\n");
-        sb.append("  Policy Qualifiers Rejected: " + policyQualifiersRejected + "\n");
+		sb.append("  Validity Date: ").append(String.valueOf(date))
+				.append('\n');
+		sb.append("  Signature Provider: ").append(String.valueOf(sigProvider))
+				.append('\n');
+		sb.append("  Default Revocation Enabled: ").append(revocationEnabled)
+				.append('\n');
+		sb.append("  Explicit Policy Required: ")
+				.append(explicitPolicyRequired).append('\n');
+		sb.append("  Policy Mapping Inhibited: ")
+				.append(policyMappingInhibited).append('\n');
+		sb.append("  Any Policy Inhibited: ").append(anyPolicyInhibited)
+				.append('\n');
+		sb.append("  Policy Qualifiers Rejected: ")
+				.append(policyQualifiersRejected).append('\n');
 
         /* now, append target cert requirements */
-        sb.append("  Target Cert Constraints: " + String.valueOf(certSelector) + "\n");
+		sb.append("  Target Cert Constraints: ")
+				.append(String.valueOf(certSelector)).append('\n');
 
         /* finally, append miscellaneous parameters */
         if (certPathCheckers != null)
-            sb.append("  Certification Path Checkers: ["
-                + certPathCheckers.toString() + "]\n");
+            sb.append("  Certification Path Checkers: [").append(certPathCheckers.toString()).append("]\n");
         if (certStores != null)
-            sb.append("  CertStores: [" + certStores.toString() + "]\n");
-        sb.append("]");
+            sb.append("  CertStores: [").append(certStores.toString()).append("]\n");
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PolicyQualifierInfo.java
--- a/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Mon Aug 11 21:07:56 2014 -0300
@@ -163,10 +163,11 @@
         HexDumpEncoder enc = new HexDumpEncoder();
         StringBuilder sb = new StringBuilder();
         sb.append("PolicyQualifierInfo: [\n");
-        sb.append("  qualifierID: " + mId + "\n");
-        sb.append("  qualifier: " +
-            (mData == null ? "null" : enc.encodeBuffer(mData)) + "\n");
-        sb.append("]");
+        sb.append("  qualifierID: ").append(mId).append('\n');
+		sb.append("  qualifier: ")
+				.append(mData == null ? "null" : enc.encodeBuffer(mData))
+				.append('\n');
+        sb.append(']');
         pqiString = sb.toString();
         return pqiString;
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/TrustAnchor.java
--- a/src/share/classes/java/security/cert/TrustAnchor.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/TrustAnchor.java	Mon Aug 11 21:07:56 2014 -0300
@@ -320,14 +320,18 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         if (pubKey != null) {
-            sb.append("  Trusted CA Public Key: " + pubKey.toString() + "\n");
-            sb.append("  Trusted CA Issuer Name: "
-                + String.valueOf(caName) + "\n");
+			sb.append("  Trusted CA Public Key: ").append(pubKey.toString())
+					.append('\n');
+			sb.append("  Trusted CA Issuer Name: ")
+					.append(String.valueOf(caName)).append('\n');
         } else {
-            sb.append("  Trusted CA cert: " + trustedCert.toString() + "\n");
+			sb.append("  Trusted CA cert: ").append(trustedCert.toString())
+					.append('\n');
         }
-        if (nc != null)
-            sb.append("  Name Constraints: " + nc.toString() + "\n");
+        if (nc != null) {
+			sb.append("  Name Constraints: ").append(nc.toString())
+					.append('\n');
+        }
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CRLSelector.java
--- a/src/share/classes/java/security/cert/X509CRLSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CRLSelector.java	Mon Aug 11 21:07:56 2014 -0300
@@ -572,17 +572,17 @@
             sb.append("  IssuerNames:\n");
             Iterator<Object> i = issuerNames.iterator();
             while (i.hasNext())
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
         }
         if (minCRL != null)
-            sb.append("  minCRLNumber: " + minCRL + "\n");
+            sb.append("  minCRLNumber: ").append(minCRL).append('\n');
         if (maxCRL != null)
-            sb.append("  maxCRLNumber: " + maxCRL + "\n");
+            sb.append("  maxCRLNumber: ").append(maxCRL).append('\n');
         if (dateAndTime != null)
-            sb.append("  dateAndTime: " + dateAndTime + "\n");
+            sb.append("  dateAndTime: ").append(dateAndTime).append('\n');
         if (certChecking != null)
-            sb.append("  Certificate being checked: " + certChecking + "\n");
-        sb.append("]");
+            sb.append("  Certificate being checked: ").append(certChecking).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CertSelector.java
--- a/src/share/classes/java/security/cert/X509CertSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CertSelector.java	Mon Aug 11 21:07:56 2014 -0300
@@ -1814,72 +1814,67 @@
         StringBuilder sb = new StringBuilder();
         sb.append("X509CertSelector: [\n");
         if (x509Cert != null) {
-            sb.append("  Certificate: " + x509Cert.toString() + "\n");
+            sb.append("  Certificate: ").append(x509Cert.toString()).append('\n');
         }
         if (serialNumber != null) {
-            sb.append("  Serial Number: " + serialNumber.toString() + "\n");
+			sb.append("  Serial Number: ").append(serialNumber.toString())
+					.append('\n');
         }
         if (issuer != null) {
-            sb.append("  Issuer: " + getIssuerAsString() + "\n");
+			sb.append("  Issuer: ").append(getIssuerAsString()).append('\n');
         }
         if (subject != null) {
-            sb.append("  Subject: " + getSubjectAsString() + "\n");
+			sb.append("  Subject: ").append(getSubjectAsString()).append('\n');
         }
-        sb.append("  matchAllSubjectAltNames flag: "
-                  + String.valueOf(matchAllSubjectAltNames) + "\n");
+        sb.append("  matchAllSubjectAltNames flag: ")
+                .append(String.valueOf(matchAllSubjectAltNames))
+                .append('\n');
         if (subjectAlternativeNames != null) {
             sb.append("  SubjectAlternativeNames:\n");
             Iterator<List<?>> i = subjectAlternativeNames.iterator();
             while (i.hasNext()) {
                 List<?> list = i.next();
-                sb.append("    type " + list.get(0) +
-                          ", name " + list.get(1) + "\n");
+				sb.append("    type ").append(list.get(0)).append(", name ")
+						.append(list.get(1)).append('\n');
             }
         }
         if (subjectKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Subject Key Identifier: " +
-                      enc.encodeBuffer(subjectKeyID) + "\n");
+            sb.append("  Subject Key Identifier: ").append(enc.encodeBuffer(subjectKeyID)).append('\n');
         }
         if (authorityKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Authority Key Identifier: " +
-                      enc.encodeBuffer(authorityKeyID) + "\n");
+            sb.append("  Authority Key Identifier: ").append(enc.encodeBuffer(authorityKeyID)).append('\n');
         }
         if (certificateValid != null) {
-            sb.append("  Certificate Valid: " +
-                      certificateValid.toString() + "\n");
+            sb.append("  Certificate Valid: ").append(certificateValid.toString()).append('\n');
         }
         if (privateKeyValid != null) {
-            sb.append("  Private Key Valid: " +
-                      privateKeyValid.toString() + "\n");
+            sb.append("  Private Key Valid: ").append(privateKeyValid.toString()).append('\n');
         }
         if (subjectPublicKeyAlgID != null) {
-            sb.append("  Subject Public Key AlgID: " +
-                      subjectPublicKeyAlgID.toString() + "\n");
+            sb.append("  Subject Public Key AlgID: ").append(subjectPublicKeyAlgID.toString()).append('\n');
         }
         if (subjectPublicKey != null) {
-            sb.append("  Subject Public Key: " +
-                      subjectPublicKey.toString() + "\n");
+            sb.append("  Subject Public Key: ").append(subjectPublicKey.toString()).append('\n');
         }
         if (keyUsage != null) {
-            sb.append("  Key Usage: " + keyUsageToString(keyUsage) + "\n");
+            sb.append("  Key Usage: ").append(keyUsageToString(keyUsage)).append('\n');
         }
         if (keyPurposeSet != null) {
-            sb.append("  Extended Key Usage: " +
-                      keyPurposeSet.toString() + "\n");
+            sb.append("  Extended Key Usage: ").append(keyPurposeSet.toString()).append('\n');
         }
         if (policy != null) {
-            sb.append("  Policy: " + policy.toString() + "\n");
+            sb.append("  Policy: ").append(policy.toString()).append('\n');
         }
         if (pathToGeneralNames != null) {
             sb.append("  Path to names:\n");
             Iterator<GeneralNameInterface> i = pathToGeneralNames.iterator();
             while (i.hasNext()) {
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
             }
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/rmi/dgc/VMID.java
--- a/src/share/classes/java/rmi/dgc/VMID.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/rmi/dgc/VMID.java	Mon Aug 11 21:07:56 2014 -0300
@@ -124,8 +124,7 @@
         if (addr != null)
             for (int i = 0; i < addr.length; ++ i) {
                 int x = addr[i] & 0xFF;
-                sb.append((x < 0x10 ? "0" : "") +
-                          Integer.toString(x, 16));
+                sb.append(x < 0x10 ? "0" : "").append(Integer.toString(x, 16));
             }
         sb.append(':');
         sb.append(uid.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/lang/management/MemoryUsage.java
--- a/src/share/classes/java/lang/management/MemoryUsage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/MemoryUsage.java	Mon Aug 11 21:07:56 2014 -0300
@@ -237,13 +237,16 @@
      * Returns a descriptive representation of this memory usage.
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder();
-        buf.append("init = " + init + "(" + (init >> 10) + "K) ");
-        buf.append("used = " + used + "(" + (used >> 10) + "K) ");
-        buf.append("committed = " + committed + "(" +
-                   (committed >> 10) + "K) " );
-        buf.append("max = " + max + "(" + (max >> 10) + "K)");
-        return buf.toString();
+        StringBuilder sb = new StringBuilder();
+		sb.append("init = ").append(init).append('(').append(init >> 10)
+				.append("K) ");
+		sb.append("used = ").append(used).append('(').append(used >> 10)
+				.append("K) ");
+		sb.append("committed = ").append(committed).append('(')
+				.append(committed >> 10).append("K) ");
+		sb.append("max = ").append(max).append('(').append(max >> 10)
+				.append("K)");
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/java/lang/management/ThreadInfo.java
--- a/src/share/classes/java/lang/management/ThreadInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/ThreadInfo.java	Mon Aug 11 21:07:56 2014 -0300
@@ -579,15 +579,17 @@
      * @return a string representation of this thread info.
      */
     public String toString() {
-        StringBuilder sb = new StringBuilder("\"" + getThreadName() + "\"" +
-                                             " Id=" + getThreadId() + " " +
-                                             getThreadState());
+    	StringBuilder sb = new StringBuilder();
+    	sb.append('"').append(getThreadName()).append('"')
+    	.append(" Id=").append(getThreadId()).append(' ')
+    	.append(getThreadState());
+
         if (getLockName() != null) {
-            sb.append(" on " + getLockName());
+            sb.append(" on ").append(getLockName());
         }
         if (getLockOwnerName() != null) {
-            sb.append(" owned by \"" + getLockOwnerName() +
-                      "\" Id=" + getLockOwnerId());
+            sb.append(" owned by \"").append(getLockOwnerName())
+                    .append("\" Id=").append(getLockOwnerId());
         }
         if (isSuspended()) {
             sb.append(" (suspended)");
@@ -599,21 +601,21 @@
         int i = 0;
         for (; i < stackTrace.length && i < MAX_FRAMES; i++) {
             StackTraceElement ste = stackTrace[i];
-            sb.append("\tat " + ste.toString());
+            sb.append("\tat ").append(ste.toString());
             sb.append('\n');
             if (i == 0 && getLockInfo() != null) {
                 Thread.State ts = getThreadState();
                 switch (ts) {
                     case BLOCKED:
-                        sb.append("\t-  blocked on " + getLockInfo());
+                        sb.append("\t-  blocked on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case TIMED_WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     default:
@@ -622,7 +624,7 @@
 
             for (MonitorInfo mi : lockedMonitors) {
                 if (mi.getLockedStackDepth() == i) {
-                    sb.append("\t-  locked " + mi);
+                    sb.append("\t-  locked ").append(mi);
                     sb.append('\n');
                 }
             }
@@ -634,10 +636,10 @@
 
        LockInfo[] locks = getLockedSynchronizers();
        if (locks.length > 0) {
-           sb.append("\n\tNumber of locked synchronizers = " + locks.length);
+           sb.append("\n\tNumber of locked synchronizers = ").append(locks.length);
            sb.append('\n');
            for (LockInfo li : locks) {
-               sb.append("\t- " + li);
+               sb.append("\t- ").append(li);
                sb.append('\n');
            }
        }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHParameters.java
--- a/src/share/classes/com/sun/crypto/provider/DHParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHParameters.java	Mon Aug 11 21:07:55 2014 -0300
@@ -137,8 +137,11 @@
                                + Debug.toHexString(this.p)
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
-        if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+        if (this.l != 0) {
+            sb.append(LINE_SEP).append("l:")
+            .append(LINE_SEP).append("    ")
+            .append(this.l);
+        }
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHPublicKey.java
--- a/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Mon Aug 11 21:07:55 2014 -0300
@@ -268,8 +268,10 @@
                                + Debug.toHexString(this.p)
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
-        if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+        if (this.l != 0) {
+            sb.append(LINE_SEP).append("l:").append(LINE_SEP)
+            .append("    ").append(this.l);
+        }
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/GCMParameters.java
--- a/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Mon Aug 11 21:07:55 2014 -0300
@@ -140,7 +140,8 @@
             = new StringBuilder(LINE_SEP + "    iv:" + LINE_SEP + "["
                 + encoder.encodeBuffer(iv) + "]");
 
-        sb.append(LINE_SEP + "tLen(bits):" + LINE_SEP + tLen*8 + LINE_SEP);
+        sb.append(LINE_SEP).append("tLen(bits):").append(LINE_SEP)
+        .append(tLen * 8).append(LINE_SEP);
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/OAEPParameters.java
--- a/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Mon Aug 11 21:07:55 2014 -0300
@@ -238,11 +238,12 @@
     }
 
     protected String engineToString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("MD: " + mdName + "\n");
-        sb.append("MGF: MGF1" + mgfSpec.getDigestAlgorithm() + "\n");
-        sb.append("PSource: PSpecified " +
-            (p.length==0? "":Debug.toHexString(new BigInteger(p))) + "\n");
-        return sb.toString();
+		StringBuilder sb = new StringBuilder();
+		sb.append("MD: ").append(mdName).append('\n');
+		sb.append("MGF: MGF1").append(mgfSpec.getDigestAlgorithm())
+				.append('\n');
+		sb.append("PSource: PSpecified ").append(p.length == 0 ? "" : 
+			Debug.toHexString(new BigInteger(p))).append('\n');
+		return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/RC2Parameters.java
--- a/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Mon Aug 11 21:07:55 2014 -0300
@@ -221,8 +221,9 @@
                 + encoder.encodeBuffer(iv) + "]");
 
         if (version != 0) {
-            sb.append(LINE_SEP + "version:" + LINE_SEP
-                + version + LINE_SEP);
+            sb.append(LINE_SEP).append("version:")
+                    .append(LINE_SEP).append(version)
+                    .append(LINE_SEP);
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Mon Aug 11 21:07:55 2014 -0300
@@ -65,7 +65,7 @@
                 "extractSubNet", "BINARY ARRAY :");
             StringBuilder sb = new StringBuilder();
             for(int i =0; i < addrLength; i++) {
-                sb.append((b[i] & 0xFF) + ":");
+                sb.append(b[i] & 0xFF).append(':');
             }
             SNMP_LOGGER.logp(Level.FINEST, NetMaskImpl.class.getName(),
                 "extractSubNet", sb.toString());
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Mon Aug 11 21:07:55 2014 -0300
@@ -204,7 +204,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Mon Aug 11 21:07:55 2014 -0300
@@ -379,7 +379,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(IDENTIFIER);
-   jjtn000.name.append( "." + t.image);
+   jjtn000.name.append('.').append(t.image);
       }
     } finally {
     if (jjtc000) {
@@ -408,7 +408,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -454,7 +454,7 @@
         }
         jj_consume_token(MARK);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -483,7 +483,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
       jj_consume_token(MASK);
       t = jj_consume_token(INTEGER_LITERAL);
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj	Mon Aug 11 21:07:55 2014 -0300
@@ -420,7 +420,7 @@
   t=<IDENTIFIER> { jjtn000.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtn000.name.append( "." + t.image); }
+  {jjtn000.name.append( '.')append(t.image); }
 )*/*@bgen(jjtree)*/
   } finally {
     if (jjtc000) {
@@ -447,7 +447,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -501,7 +501,7 @@
   {jjtn000.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -527,7 +527,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL>/*@bgen(jjtree)*/
                             {
                               jjtree.closeNodeScope(jjtn000, true);
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt	Mon Aug 11 21:07:55 2014 -0300
@@ -213,7 +213,7 @@
   t=<IDENTIFIER> { jjtThis.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtThis.name.append( "." + t.image); }
+  {jjtThis.name.append( '.').append(t.image); }
 )*
 
 }
@@ -228,7 +228,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )*
 
 }
@@ -253,7 +253,7 @@
   {jjtThis.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )*
 }
 
@@ -267,7 +267,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL> {jjtThis.mask = t.image; }
 }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Mon Aug 11 21:07:55 2014 -0300
@@ -99,7 +99,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java
--- a/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Mon Aug 11 21:07:55 2014 -0300
@@ -479,10 +479,10 @@
      */
     public String printMessage() {
         StringBuilder sb = new StringBuilder();
-        sb.append("msgId : " + msgId + "\n");
-        sb.append("msgMaxSize : " + msgMaxSize + "\n");
-        sb.append("msgFlags : " + msgFlags + "\n");
-        sb.append("msgSecurityModel : " + msgSecurityModel + "\n");
+        sb.append("msgId : ").append(msgId).append('\n');
+        sb.append("msgMaxSize : ").append(msgMaxSize).append('\n');
+        sb.append("msgFlags : ").append(msgFlags).append('\n');
+        sb.append("msgSecurityModel : ").append(msgSecurityModel).append('\n');
 
         if (contextEngineId == null) {
             sb.append("contextEngineId : null");
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
--- a/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Mon Aug 11 21:07:55 2014 -0300
@@ -256,7 +256,7 @@
     private static String stringifyComponent(NameComponent comp) {
         StringBuilder one = new StringBuilder(escape(comp.id));
         if (comp.kind != null && !comp.kind.equals("")) {
-            one.append(kindSeparator + escape(comp.kind));
+            one.append(kindSeparator).append(escape(comp.kind));
         }
         if (one.length() == 0) {
             return ""+kindSeparator;  // if neither id nor kind specified
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java
--- a/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Mon Aug 11 21:07:55 2014 -0300
@@ -90,7 +90,7 @@
                         if (selected == -1) {
                             StringBuilder allChoices = new StringBuilder();
                             for (int j = 0; j <  choices.length; j++) {
-                                allChoices.append(choices[j] + ",");
+                                allChoices.append(choices[j]).append(',');
                             }
                             throw new IOException("Cannot match " +
                                 "'java.naming.security.sasl.realm' property value, '" +
diff -r dde9f5cfde5f src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
--- a/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Mon Aug 11 21:07:55 2014 -0300
@@ -167,9 +167,9 @@
         for (int i = 0; i < allchannelnames.length; i++) {
             if ((channelmask & m) != 0L) {
                 if (i < channelnames.length) {
-                    sb.append(channelnames[i] + " ");
+                    sb.append(channelnames[i]).append(' ');
                 } else {
-                    sb.append(allchannelnames[i] + " ");
+                    sb.append(allchannelnames[i]).append(' ');
                 }
             }
             m *= 2L;
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Mon Aug 11 21:07:55 2014 -0300
@@ -235,14 +235,15 @@
                     String nodeName = att.getNodeName();
                     if ((nodeName.equals("xmlns") || nodeName.startsWith("xmlns:"))
                         && !storedNamespaces.containsKey(att.getNodeName())) {
-                        sb.append(" " + nodeName + "=\"" + att.getNodeValue() + "\"");
+                        sb.append(' ').append(nodeName).append("=\"")
+                        .append(att.getNodeValue()).append('"');
                         storedNamespaces.put(nodeName, att.getNodeValue());
                     }
                 }
             }
             wk = wk.getParentNode();
         }
-        sb.append(">" + source + "</dummy>");
+        sb.append('>').append(source).append("</dummy>");
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Mon Aug 11 21:07:55 2014 -0300
@@ -85,7 +85,7 @@
             if (prefix.equals("xmlns")) {
                 sb.append("#default ");
             } else {
-                sb.append(prefix + " ");
+                sb.append(prefix).append(' ');
             }
         }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Mon Aug 11 21:07:55 2014 -0300
@@ -88,7 +88,7 @@
                 l += countQuotes(DN, j, k);
 
                 if ((k > 0) && (DN.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml) + ",");
+                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml)).append(',');
 
                     i = k + 1;
                     l = 0;
@@ -121,7 +121,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(parseATAV(trim(str.substring(i, k)), toXml) + "+");
+                sb.append(parseATAV(trim(str.substring(i, k)), toXml)).append('+');
 
                 i = k + 1;
                 l = 0;
@@ -369,7 +369,7 @@
         int k;
 
         for (int j = 0; (k = string.indexOf("\\20", j)) >= 0; j = k + 3) {
-            sb.append(trim(string.substring(i, k)) + "\\ ");
+            sb.append(trim(string.substring(i, k))).append("\\ ");
 
             i = k + 3;
         }
@@ -418,7 +418,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(trim(str.substring(i, k)) + replace);
+                sb.append(trim(str.substring(i, k))).append(replace);
 
                 i = k + 1;
                 l = 0;
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/CramMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Mon Aug 11 21:07:55 2014 -0300
@@ -196,8 +196,7 @@
 
         for (i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Mon Aug 11 21:07:55 2014 -0300
@@ -391,8 +391,7 @@
 
         for (int i = 0; i < digest.length; i ++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0"+
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/ParseException.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Mon Aug 11 21:07:55 2014 -0300
@@ -198,7 +198,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Mon Aug 11 21:07:55 2014 -0300
@@ -107,7 +107,7 @@
         default:
           if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
             String s = "0000" + Integer.toString(ch, 16);
-            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+            retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
           } else {
             retval.append(ch);
           }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
--- a/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Mon Aug 11 21:07:55 2014 -0300
@@ -338,10 +338,10 @@
             if (classpath.isEmpty()) {
                 String envcp = System.getProperty("env.class.path");
                 if ((envcp != null) && (envcp.length() > 0)) {
-                    munged.append(" -classpath " + envcp);
+                    munged.append(" -classpath ").append(envcp);
                 }
             } else {
-                munged.append(" -classpath " + classpath.asString());
+                munged.append(" -classpath ").append(classpath.asString());
             }
             return munged.toString();
         } else {
@@ -349,14 +349,4 @@
         }
     }
 
-    private String appendPath(String path1, String path2) {
-        if (path1 == null || path1.length() == 0) {
-            return path2 == null ? "." : path2;
-        } else if (path2 == null || path2.length() == 0) {
-            return path1;
-        } else {
-            return path1  + File.pathSeparator + path2;
-        }
-    }
-
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Mon Aug 11 21:07:55 2014 -0300
@@ -346,12 +346,12 @@
 
     public String valueString(boolean bigLimit) {
         // Char arrays deserve special treatment
-        StringBuffer result;
+        StringBuilder result;
         byte[] value = getValue();
         int max = value.length;
         byte elementSignature = getElementType();
         if (elementSignature == 'C')  {
-            result = new StringBuffer();
+            result = new StringBuilder();
             for (int i = 0; i < value.length; ) {
                 char val = charAt(i, value);
                 result.append(val);
@@ -362,7 +362,7 @@
             if (bigLimit) {
                 limit = 1000;
             }
-            result = new StringBuffer("{");
+            result = new StringBuilder("{");
             int num = 0;
             for (int i = 0; i < value.length; ) {
                 if (num > 0) {
@@ -386,37 +386,37 @@
                     }
                     case 'B': {
                         int val = 0xFF & byteAt(i, value);
-                        result.append("0x" + Integer.toString(val, 16));
+                        result.append("0x").append(Integer.toString(val, 16));
                         i++;
                         break;
                     }
                     case 'S': {
                         short val = shortAt(i, value);
                         i += 2;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'I': {
                         int val = intAt(i, value);
                         i += 4;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'J': {         // long
                         long val = longAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
                     case 'F': {
                         float val = floatAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 4;
                         break;
                     }
                     case 'D': {         // double
                         double val = doubleAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
@@ -425,7 +425,7 @@
                     }
                 }
             }
-            result.append("}");
+            result.append('}');
         }
         return result.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/util/Misc.java
--- a/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Mon Aug 11 21:07:55 2014 -0300
@@ -97,11 +97,11 @@
             } else if (ch == '&') {
                 sb.append("&amp;");
             } else if (ch < ' ') {
-                sb.append("&#" + Integer.toString(ch) + ";");
+                sb.append("&#").append(Integer.toString(ch)).append(';');
             } else {
                 int c = (ch & 0xFFFF);
                 if (c > 127) {
-                    sb.append("&#" + Integer.toString(c) + ";");
+                    sb.append("&#").append(Integer.toString(c)).append(';');
                 } else {
                     sb.append(ch);
                 }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
--- a/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Mon Aug 11 21:07:55 2014 -0300
@@ -881,12 +881,12 @@
             } else if (tag == JDWP.TypeTag.ARRAY) {
                 sb.append("ArrayType");
             } else {
-                sb.append("UNKNOWN TAG: " + tag);
+                sb.append("UNKNOWN TAG: ").append(tag);
             }
             if (signature != null) {
-                sb.append(", signature='" + signature + "'");
+                sb.append(", signature='").append(signature).append('\'');
             }
-            sb.append(", id=" + id);
+            sb.append(", id=").append(id);
             vm.printTrace(sb.toString());
         }
         if (id == 0) {

From andrej.golovnin at gmail.com  Tue Aug 12 07:48:00 2014
From: andrej.golovnin at gmail.com (Andrej Golovnin)
Date: Tue, 12 Aug 2014 09:48:00 +0200
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
Message-ID: <CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>

Hi Ot?vio,

I think you should fix the indentation in a lot of classes. You use the
tab-character for the indentation. As far as I know we should use the space
character for the indentation in the JDK sources (Oracle devs feel free to
correct me if I'm wrong. And it would be really nice if the style guide for
the source code would be a part of the JDK repository. So we don't need to
search for it on the internet/wiki. Just clone the repository, read the
style guide and follow it. :-) ). Here is the not complete list of classes
where you used the tab-character for the indentation:

src/share/classes/com/sun/crypto/provider/OAEPParameters.java
src/share/classes/java/lang/management/MemoryUsage.java
src/share/classes/java/security/KeyStore.java
src/share/classes/java/security/PermissionCollection.java
src/share/classes/java/security/ProtectionDomain.java
src/share/classes/java/security/cert/CertPath.java
src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
src/share/classes/java/security/cert/PKIXParameters.java
src/share/classes/java/security/cert/PolicyQualifierInfo.java
src/share/classes/java/security/cert/TrustAnchor.java
src/share/classes/java/security/cert/X509CertSelector.java
src/share/classes/javax/crypto/CryptoPermission.java
src/share/classes/javax/management/relation/Role.java


In src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj in the line 423 a dot
is missed before append:

423   {jjtn000.name.append( '.')append(t.image); }

Best regards,
Andrej Golovnin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140812/2fd8c319/attachment.html>

From pavel.rappo at oracle.com  Mon Aug 11 10:56:05 2014
From: pavel.rappo at oracle.com (Pavel Rappo)
Date: Mon, 11 Aug 2014 11:56:05 +0100
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
Message-ID: <476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>

> In the class
> src/share/classes/javax/management/openmbean/CompositeType.java you have
> added the
> annotation @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
> instead of fixing the concatenation inside the append method. Why?

+1 Moreover, I wonder where this value comes from? I've never seen it before. Here are warnings that javac supports:

all,auxiliaryclass,cast,classfile,deprecation,dep-ann,divzero,empty,fallthrough,finally,options,overloads,overrides,path,processing,rawtypes,serial,static,try,unchecked,varargs

It doesn't look like one of Eclipse's warnings either.

> And I would like to suggest to drop explicit usage of StringBuilder in some
> methods at all to improve code readability.

Agree.

-Pavel



From pavel.rappo at oracle.com  Mon Aug 11 14:33:14 2014
From: pavel.rappo at oracle.com (Pavel Rappo)
Date: Mon, 11 Aug 2014 15:33:14 +0100
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
Message-ID: <141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>

Otavio,

Just skimmed through your changes. It looks good. But there are some things we can make a little bit better though. IMO, it's not always a performance that matters (looking around to see if Alexey Shipilev is somewhere near) but readability. It's good to estimate performance requirements of a code before making a decision of whether to sacrifice readability for performance or not. I noticed there are some methods that are screaming for readability improvements. Namely, different versions of joining strings through a separator. You can find them in following methods in your changeset:

	sun.security.acl.AclEntryImpl::toString
	sun.security.ssl.HandshakeMessage.CertificateRequest::print
	javax.swing.MultiUIDefaults::toString (one of the most bizarre one)
	sun.security.provider.PolicyFile::expandSelf
	java.security.ProtectionDomain::toString
	javax.management.relation.Role::toString
	sun.security.ssl.SupportedEllipticCurvesExtension::toString
	sun.tools.jstat.SyntaxException::SyntaxException

Unfortunately, neither java.util.StringJoiner nor String.join have perfect (but who has?) APIs. So it's up to us to figure out the best way of joining elements. So when the power of those guys is not enough, we can go this way (or maybe some else):
	
	Iterable<?> elements = ...
        StringJoiner j = new StringJoiner(", ");
	elements.forEach(e -> j.add(e.toString()));

or

	Collection<?> elements = ...
        String i = elements.stream()
                 	   .map(Object::toString)
                           .collect(Collectors.joining(", "));

Other than that:

1. It looks like some StringBuffers are still lurking out there. We should change them to StringBuilders, *only if* we can prove they are not exposed to more than one thread:

--- dev/jdk/src/share/classes/javax/sound/sampled/AudioFileFormat.java	(revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
+++ dev/jdk/src/share/classes/javax/sound/sampled/AudioFileFormat.java	(revision 10452+:8e501e6bbf1f+)
@@ -272,7 +272,7 @@
     @Override
     public String toString() {
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         //$$fb2002-11-01: fix for 4672864: AudioFileFormat.toString() throws unexpected NullPointerException
         if (type != null) {

--- dev/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	(revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
+++ dev/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	(revision 10452+:8e501e6bbf1f+)
@@ -346,12 +346,12 @@
 
     public String valueString(boolean bigLimit) {
         // Char arrays deserve special treatment
-        StringBuffer result;
+        StringBuilder result;
         byte[] value = getValue();
         int max = value.length;
         byte elementSignature = getElementType();
         if (elementSignature == 'C')  {
-            result = new StringBuffer();
+            result = new StringBuilder();
             for (int i = 0; i < value.length; ) {
                 char val = charAt(i, value);
                 result.append(val);
@@ -362,7 +362,7 @@
             if (bigLimit) {
                 limit = 1000;
             }
-            result = new StringBuffer("{");
+            result = new StringBuilder("{");
             int num = 0;
             for (int i = 0; i < value.length; ) {
                 if (num > 0) {

--- dev/jdk/src/share/classes/javax/swing/GroupLayout.java	(revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
+++ dev/jdk/src/share/classes/javax/swing/GroupLayout.java	(revision 10452+:8e501e6bbf1f+)
@@ -1213,7 +1213,7 @@
             registerComponents(horizontalGroup, HORIZONTAL);
             registerComponents(verticalGroup, VERTICAL);
         }
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         buffer.append("HORIZONTAL\n");
         createSpringDescription(buffer, horizontalGroup, "  ", HORIZONTAL);
         buffer.append("\nVERTICAL\n");
@@ -1221,7 +1221,7 @@
         return buffer.toString();
     }
 
-    private void createSpringDescription(StringBuffer buffer, Spring spring,
+    private void createSpringDescription(StringBuilder buffer, Spring spring,
             String indent, int axis) {
         String origin = "";
         String padding = "";

--- dev/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	(revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
+++ dev/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	(revision 10452+:8e501e6bbf1f+)
@@ -463,7 +463,7 @@
 
     // ---------
 
-    private static void appendIfLiteralAddress(String addr, StringBuffer sb) {
+    private static void appendIfLiteralAddress(String addr, StringBuilder sb) {
         if (IPAddressUtil.isIPv4LiteralAddress(addr)) {
             sb.append("dns://").append(addr).append(' ');
         } else {
@@ -478,10 +478,8 @@
      *         corresponding to the supplied List of nameservers.
      */
     private static String createProviderURL(List<String> nsList) {
-        StringBuffer sb = new StringBuffer();
-        for (String s: nsList) {
-            appendIfLiteralAddress(s, sb);
-        }
+        StringBuilder sb = new StringBuilder();
+        nsList.forEach(s -> appendIfLiteralAddress(s, sb));
         return sb.toString();
     }
 
@@ -491,7 +489,7 @@
      *         contained in the provided str.
      */
     private static String createProviderURL(String str) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         StringTokenizer st = new StringTokenizer(str, ",");
         while (st.hasMoreTokens()) {
             appendIfLiteralAddress(st.nextToken(), sb);


2. Also there are some minor issues with line width and readability:

--- dev/jdk/src/share/classes/java/security/cert/CertPath.java	(revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
+++ dev/jdk/src/share/classes/java/security/cert/CertPath.java	(revision 10452+:8e501e6bbf1f+)
@@ -224,16 +224,16 @@
         Iterator<? extends Certificate> stringIterator =
                                         getCertificates().iterator();
 
-        sb.append('\n').append(type).append(" Cert Path: length = ").append(getCertificates().size()).append(".\n");
-        sb.append("[\n");
+        sb.append('\n').append(type).append(" Cert Path: length = ")
+          .append(getCertificates().size()).append(".\n").append("[\n");
         int i = 1;
         while (stringIterator.hasNext()) {
-            sb.append("==========================================" + "===============Certificate ")
-                    .append(i).append(" start.\n");
+            sb.append("==========================================")
+              .append("===============Certificate ").append(i).append(" start.\n");
             Certificate stringCert = stringIterator.next();
-            sb.append(stringCert.toString());
-            sb.append("\n========================================" + "=================Certificate ")
-                    .append(i).append(" end.\n\n\n");
+            sb.append(stringCert.toString()).append('\n');
+            sb.append("========================================")
+              .append("=================Certificate ").append(i).append(" end.\n\n\n");
             i++;
         }

--- dev/jdk/src/share/classes/javax/swing/JColorChooser.java	(revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
+++ dev/jdk/src/share/classes/javax/swing/JColorChooser.java	(revision 10452+:8e501e6bbf1f+)
@@ -543,7 +543,7 @@
      * @return  a string representation of this <code>JColorChooser</code>
      */
     protected String paramString() {
-        StringBuilder chooserPanelsString = new StringBuilder("");
+        StringBuilder chooserPanelsString = new StringBuilder();
         for (int i=0; i<chooserPanels.length; i++) {
             chooserPanelsString.append('[').append(chooserPanels[i].toString()).append(']');
         }
 
3. Btw, I wonder what "try ... catch" is doing here. Haven't we checked enum_.hasMoreElements() is true? (I guess it's a question to the security team).

--- dev/jdk/src/share/classes/java/security/PermissionCollection.java	(revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
+++ dev/jdk/src/share/classes/java/security/PermissionCollection.java	(revision 10452+:8e501e6bbf1f+)
@@ -181,13 +181,9 @@
         StringBuilder sb = new StringBuilder();
         sb.append(super.toString()).append(" (\n");
         while (enum_.hasMoreElements()) {
-            try {
-                sb.append(' ');
-                sb.append(enum_.nextElement().toString());
-                sb.append('\n');
+            sb.append(' ');
+            sb.append(enum_.nextElement().toString());
+            sb.append('\n');
-            } catch (NoSuchElementException e){
-                // ignore
-            }
         }
         sb.append(")\n");
         return sb.toString();

4. This method looks dead (not used):

--- dev/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	(revision 10452:8e501e6bbf1fda1bf9b19bc00fff02074162946f)
+++ dev/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	(revision 10452+:8e501e6bbf1f+)
@@ -348,15 +348,4 @@
             return javaArgs;
         }
     }
-
-    private String appendPath(String path1, String path2) {
-        if (path1 == null || path1.length() == 0) {
-            return path2 == null ? "." : path2;
-        } else if (path2 == null || path2.length() == 0) {
-            return path1;
-        } else {
-            return path1  + File.pathSeparator + path2;
-        }
-    }
-
 }

-Pavel

From weijun.wang at oracle.com  Tue Aug 12 08:02:55 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Tue, 12 Aug 2014 16:02:55 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
Message-ID: <AEF9973E-C94A-44F0-BB8F-BD497605234C@oracle.com>

No TAB, no \r, and no trailing space are hard requirements enforced by jcheck. Otherwise it's only styles, including 4-space-indentation. "{" at the end of a line, 8-space wrap indentation...

--Max (an Oracle dev)

On Aug 12, 2014, at 15:48, Andrej Golovnin <andrej.golovnin at gmail.com> wrote:

> As far as I know we should use the space character for the indentation in the JDK sources (Oracle devs feel free to correct me if I'm wrong.



From otaviojava at java.net  Tue Aug 12 11:51:47 2014
From: otaviojava at java.net (=?UTF-8?Q?Ot=C3=A1vio_Gon=C3=A7alves_de_Santana?=)
Date: Tue, 12 Aug 2014 08:51:47 -0300
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
Message-ID: <CAPc8kR0vrfbcAmmxM5_O22VADtd_WBzEyjaWVxad27-ydPJ7Xw@mail.gmail.com>

Thank you Andrej
Done.

https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_5.zip


On Tue, Aug 12, 2014 at 4:48 AM, Andrej Golovnin <andrej.golovnin at gmail.com>
wrote:

> Hi Ot?vio,
>
> I think you should fix the indentation in a lot of classes. You use the
> tab-character for the indentation. As far as I know we should use the space
> character for the indentation in the JDK sources (Oracle devs feel free to
> correct me if I'm wrong. And it would be really nice if the style guide for
> the source code would be a part of the JDK repository. So we don't need to
> search for it on the internet/wiki. Just clone the repository, read the
> style guide and follow it. :-) ). Here is the not complete list of classes
> where you used the tab-character for the indentation:
>
> src/share/classes/com/sun/crypto/provider/OAEPParameters.java
> src/share/classes/java/lang/management/MemoryUsage.java
> src/share/classes/java/security/KeyStore.java
> src/share/classes/java/security/PermissionCollection.java
> src/share/classes/java/security/ProtectionDomain.java
> src/share/classes/java/security/cert/CertPath.java
> src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
> src/share/classes/java/security/cert/PKIXParameters.java
> src/share/classes/java/security/cert/PolicyQualifierInfo.java
> src/share/classes/java/security/cert/TrustAnchor.java
> src/share/classes/java/security/cert/X509CertSelector.java
> src/share/classes/javax/crypto/CryptoPermission.java
> src/share/classes/javax/management/relation/Role.java
>
>
> In src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj in the line 423 a
> dot is missed before append:
>
> 423   {jjtn000.name.append( '.')append(t.image); }
>
> Best regards,
> Andrej Golovnin
>



-- 
Ot?vio Gon?alves de Santana

blog:     http://otaviosantana.blogspot.com.br/
twitter: http://twitter.com/otaviojava
site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
55 (11) 98255-3513
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140812/792d4b2a/attachment.html>
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHParameters.java
--- a/src/share/classes/com/sun/crypto/provider/DHParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHParameters.java	Tue Aug 12 08:47:10 2014 -0300
@@ -137,8 +137,11 @@
                                + Debug.toHexString(this.p)
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
-        if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+        if (this.l != 0) {
+            sb.append(LINE_SEP).append("l:")
+            .append(LINE_SEP).append("    ")
+            .append(this.l);
+        }
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHPublicKey.java
--- a/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Tue Aug 12 08:47:10 2014 -0300
@@ -268,8 +268,10 @@
                                + Debug.toHexString(this.p)
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
-        if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+        if (this.l != 0) {
+            sb.append(LINE_SEP).append("l:").append(LINE_SEP)
+            .append("    ").append(this.l);
+        }
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/GCMParameters.java
--- a/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Tue Aug 12 08:47:10 2014 -0300
@@ -140,7 +140,8 @@
             = new StringBuilder(LINE_SEP + "    iv:" + LINE_SEP + "["
                 + encoder.encodeBuffer(iv) + "]");
 
-        sb.append(LINE_SEP + "tLen(bits):" + LINE_SEP + tLen*8 + LINE_SEP);
+        sb.append(LINE_SEP).append("tLen(bits):").append(LINE_SEP)
+        .append(tLen * 8).append(LINE_SEP);
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/OAEPParameters.java
--- a/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Tue Aug 12 08:47:10 2014 -0300
@@ -239,10 +239,12 @@
 
     protected String engineToString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("MD: " + mdName + "\n");
-        sb.append("MGF: MGF1" + mgfSpec.getDigestAlgorithm() + "\n");
-        sb.append("PSource: PSpecified " +
-            (p.length==0? "":Debug.toHexString(new BigInteger(p))) + "\n");
+        sb.append("MD: ").append(mdName).append('\n');
+        sb.append("MGF: MGF1").append(mgfSpec.getDigestAlgorithm())
+                .append('\n');
+        sb.append("PSource: PSpecified ")
+                .append(p.length == 0 ? "" : Debug
+                        .toHexString(new BigInteger(p))).append('\n');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/RC2Parameters.java
--- a/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Tue Aug 12 08:47:10 2014 -0300
@@ -221,8 +221,9 @@
                 + encoder.encodeBuffer(iv) + "]");
 
         if (version != 0) {
-            sb.append(LINE_SEP + "version:" + LINE_SEP
-                + version + LINE_SEP);
+            sb.append(LINE_SEP).append("version:")
+                    .append(LINE_SEP).append(version)
+                    .append(LINE_SEP);
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Tue Aug 12 08:47:10 2014 -0300
@@ -65,7 +65,7 @@
                 "extractSubNet", "BINARY ARRAY :");
             StringBuilder sb = new StringBuilder();
             for(int i =0; i < addrLength; i++) {
-                sb.append((b[i] & 0xFF) + ":");
+                sb.append(b[i] & 0xFF).append(':');
             }
             SNMP_LOGGER.logp(Level.FINEST, NetMaskImpl.class.getName(),
                 "extractSubNet", sb.toString());
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Tue Aug 12 08:47:10 2014 -0300
@@ -204,7 +204,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Tue Aug 12 08:47:10 2014 -0300
@@ -379,7 +379,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(IDENTIFIER);
-   jjtn000.name.append( "." + t.image);
+   jjtn000.name.append('.').append(t.image);
       }
     } finally {
     if (jjtc000) {
@@ -408,7 +408,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -454,7 +454,7 @@
         }
         jj_consume_token(MARK);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -483,7 +483,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
       jj_consume_token(MASK);
       t = jj_consume_token(INTEGER_LITERAL);
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj	Tue Aug 12 08:47:10 2014 -0300
@@ -420,7 +420,7 @@
   t=<IDENTIFIER> { jjtn000.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtn000.name.append( "." + t.image); }
+  {jjtn000.name.append( '.').append(t.image); }
 )*/*@bgen(jjtree)*/
   } finally {
     if (jjtc000) {
@@ -447,7 +447,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -501,7 +501,7 @@
   {jjtn000.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -527,7 +527,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL>/*@bgen(jjtree)*/
                             {
                               jjtree.closeNodeScope(jjtn000, true);
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt	Tue Aug 12 08:47:10 2014 -0300
@@ -213,7 +213,7 @@
   t=<IDENTIFIER> { jjtThis.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtThis.name.append( "." + t.image); }
+  {jjtThis.name.append( '.').append(t.image); }
 )*
 
 }
@@ -228,7 +228,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )*
 
 }
@@ -253,7 +253,7 @@
   {jjtThis.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )*
 }
 
@@ -267,7 +267,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL> {jjtThis.mask = t.image; }
 }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Tue Aug 12 08:47:10 2014 -0300
@@ -99,7 +99,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java
--- a/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Tue Aug 12 08:47:10 2014 -0300
@@ -479,10 +479,10 @@
      */
     public String printMessage() {
         StringBuilder sb = new StringBuilder();
-        sb.append("msgId : " + msgId + "\n");
-        sb.append("msgMaxSize : " + msgMaxSize + "\n");
-        sb.append("msgFlags : " + msgFlags + "\n");
-        sb.append("msgSecurityModel : " + msgSecurityModel + "\n");
+        sb.append("msgId : ").append(msgId).append('\n');
+        sb.append("msgMaxSize : ").append(msgMaxSize).append('\n');
+        sb.append("msgFlags : ").append(msgFlags).append('\n');
+        sb.append("msgSecurityModel : ").append(msgSecurityModel).append('\n');
 
         if (contextEngineId == null) {
             sb.append("contextEngineId : null");
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
--- a/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Tue Aug 12 08:47:10 2014 -0300
@@ -256,7 +256,7 @@
     private static String stringifyComponent(NameComponent comp) {
         StringBuilder one = new StringBuilder(escape(comp.id));
         if (comp.kind != null && !comp.kind.equals("")) {
-            one.append(kindSeparator + escape(comp.kind));
+            one.append(kindSeparator).append(escape(comp.kind));
         }
         if (one.length() == 0) {
             return ""+kindSeparator;  // if neither id nor kind specified
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java
--- a/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Tue Aug 12 08:47:10 2014 -0300
@@ -90,7 +90,7 @@
                         if (selected == -1) {
                             StringBuilder allChoices = new StringBuilder();
                             for (int j = 0; j <  choices.length; j++) {
-                                allChoices.append(choices[j] + ",");
+                                allChoices.append(choices[j]).append(',');
                             }
                             throw new IOException("Cannot match " +
                                 "'java.naming.security.sasl.realm' property value, '" +
diff -r dde9f5cfde5f src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
--- a/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Tue Aug 12 08:47:10 2014 -0300
@@ -167,9 +167,9 @@
         for (int i = 0; i < allchannelnames.length; i++) {
             if ((channelmask & m) != 0L) {
                 if (i < channelnames.length) {
-                    sb.append(channelnames[i] + " ");
+                    sb.append(channelnames[i]).append(' ');
                 } else {
-                    sb.append(allchannelnames[i] + " ");
+                    sb.append(allchannelnames[i]).append(' ');
                 }
             }
             m *= 2L;
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Tue Aug 12 08:47:10 2014 -0300
@@ -235,14 +235,15 @@
                     String nodeName = att.getNodeName();
                     if ((nodeName.equals("xmlns") || nodeName.startsWith("xmlns:"))
                         && !storedNamespaces.containsKey(att.getNodeName())) {
-                        sb.append(" " + nodeName + "=\"" + att.getNodeValue() + "\"");
+                        sb.append(' ').append(nodeName).append("=\"")
+                        .append(att.getNodeValue()).append('"');
                         storedNamespaces.put(nodeName, att.getNodeValue());
                     }
                 }
             }
             wk = wk.getParentNode();
         }
-        sb.append(">" + source + "</dummy>");
+        sb.append('>').append(source).append("</dummy>");
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Tue Aug 12 08:47:10 2014 -0300
@@ -85,7 +85,7 @@
             if (prefix.equals("xmlns")) {
                 sb.append("#default ");
             } else {
-                sb.append(prefix + " ");
+                sb.append(prefix).append(' ');
             }
         }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Tue Aug 12 08:47:10 2014 -0300
@@ -88,7 +88,7 @@
                 l += countQuotes(DN, j, k);
 
                 if ((k > 0) && (DN.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml) + ",");
+                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml)).append(',');
 
                     i = k + 1;
                     l = 0;
@@ -121,7 +121,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(parseATAV(trim(str.substring(i, k)), toXml) + "+");
+                sb.append(parseATAV(trim(str.substring(i, k)), toXml)).append('+');
 
                 i = k + 1;
                 l = 0;
@@ -369,7 +369,7 @@
         int k;
 
         for (int j = 0; (k = string.indexOf("\\20", j)) >= 0; j = k + 3) {
-            sb.append(trim(string.substring(i, k)) + "\\ ");
+            sb.append(trim(string.substring(i, k))).append("\\ ");
 
             i = k + 3;
         }
@@ -418,7 +418,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(trim(str.substring(i, k)) + replace);
+                sb.append(trim(str.substring(i, k))).append(replace);
 
                 i = k + 1;
                 l = 0;
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/CramMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Tue Aug 12 08:47:10 2014 -0300
@@ -196,8 +196,7 @@
 
         for (i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Tue Aug 12 08:47:10 2014 -0300
@@ -391,8 +391,7 @@
 
         for (int i = 0; i < digest.length; i ++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0"+
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/ParseException.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Tue Aug 12 08:47:10 2014 -0300
@@ -198,7 +198,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Tue Aug 12 08:47:10 2014 -0300
@@ -107,7 +107,7 @@
         default:
           if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
             String s = "0000" + Integer.toString(ch, 16);
-            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+            retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
           } else {
             retval.append(ch);
           }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
--- a/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Tue Aug 12 08:47:10 2014 -0300
@@ -338,10 +338,10 @@
             if (classpath.isEmpty()) {
                 String envcp = System.getProperty("env.class.path");
                 if ((envcp != null) && (envcp.length() > 0)) {
-                    munged.append(" -classpath " + envcp);
+                    munged.append(" -classpath ").append(envcp);
                 }
             } else {
-                munged.append(" -classpath " + classpath.asString());
+                munged.append(" -classpath ").append(classpath.asString());
             }
             return munged.toString();
         } else {
@@ -349,14 +349,4 @@
         }
     }
 
-    private String appendPath(String path1, String path2) {
-        if (path1 == null || path1.length() == 0) {
-            return path2 == null ? "." : path2;
-        } else if (path2 == null || path2.length() == 0) {
-            return path1;
-        } else {
-            return path1  + File.pathSeparator + path2;
-        }
-    }
-
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Tue Aug 12 08:47:10 2014 -0300
@@ -346,12 +346,12 @@
 
     public String valueString(boolean bigLimit) {
         // Char arrays deserve special treatment
-        StringBuffer result;
+        StringBuilder result;
         byte[] value = getValue();
         int max = value.length;
         byte elementSignature = getElementType();
         if (elementSignature == 'C')  {
-            result = new StringBuffer();
+            result = new StringBuilder();
             for (int i = 0; i < value.length; ) {
                 char val = charAt(i, value);
                 result.append(val);
@@ -362,7 +362,7 @@
             if (bigLimit) {
                 limit = 1000;
             }
-            result = new StringBuffer("{");
+            result = new StringBuilder("{");
             int num = 0;
             for (int i = 0; i < value.length; ) {
                 if (num > 0) {
@@ -386,37 +386,37 @@
                     }
                     case 'B': {
                         int val = 0xFF & byteAt(i, value);
-                        result.append("0x" + Integer.toString(val, 16));
+                        result.append("0x").append(Integer.toString(val, 16));
                         i++;
                         break;
                     }
                     case 'S': {
                         short val = shortAt(i, value);
                         i += 2;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'I': {
                         int val = intAt(i, value);
                         i += 4;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'J': {         // long
                         long val = longAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
                     case 'F': {
                         float val = floatAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 4;
                         break;
                     }
                     case 'D': {         // double
                         double val = doubleAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
@@ -425,7 +425,7 @@
                     }
                 }
             }
-            result.append("}");
+            result.append('}');
         }
         return result.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/util/Misc.java
--- a/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Tue Aug 12 08:47:10 2014 -0300
@@ -97,11 +97,11 @@
             } else if (ch == '&') {
                 sb.append("&amp;");
             } else if (ch < ' ') {
-                sb.append("&#" + Integer.toString(ch) + ";");
+                sb.append("&#").append(Integer.toString(ch)).append(';');
             } else {
                 int c = (ch & 0xFFFF);
                 if (c > 127) {
-                    sb.append("&#" + Integer.toString(c) + ";");
+                    sb.append("&#").append(Integer.toString(c)).append(';');
                 } else {
                     sb.append(ch);
                 }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
--- a/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Tue Aug 12 08:47:10 2014 -0300
@@ -881,12 +881,12 @@
             } else if (tag == JDWP.TypeTag.ARRAY) {
                 sb.append("ArrayType");
             } else {
-                sb.append("UNKNOWN TAG: " + tag);
+                sb.append("UNKNOWN TAG: ").append(tag);
             }
             if (signature != null) {
-                sb.append(", signature='" + signature + "'");
+                sb.append(", signature='").append(signature).append('\'');
             }
-            sb.append(", id=" + id);
+            sb.append(", id=").append(id);
             vm.printTrace(sb.toString());
         }
         if (id == 0) {
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/lang/management/MemoryUsage.java
--- a/src/share/classes/java/lang/management/MemoryUsage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/MemoryUsage.java	Tue Aug 12 08:47:10 2014 -0300
@@ -237,13 +237,16 @@
      * Returns a descriptive representation of this memory usage.
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder();
-        buf.append("init = " + init + "(" + (init >> 10) + "K) ");
-        buf.append("used = " + used + "(" + (used >> 10) + "K) ");
-        buf.append("committed = " + committed + "(" +
-                   (committed >> 10) + "K) " );
-        buf.append("max = " + max + "(" + (max >> 10) + "K)");
-        return buf.toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append("init = ").append(init).append('(').append(init >> 10)
+                .append("K) ");
+        sb.append("used = ").append(used).append('(').append(used >> 10)
+                .append("K) ");
+        sb.append("committed = ").append(committed).append('(')
+                .append(committed >> 10).append("K) ");
+        sb.append("max = ").append(max).append('(').append(max >> 10)
+                .append("K)");
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/java/lang/management/ThreadInfo.java
--- a/src/share/classes/java/lang/management/ThreadInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/ThreadInfo.java	Tue Aug 12 08:47:10 2014 -0300
@@ -579,15 +579,17 @@
      * @return a string representation of this thread info.
      */
     public String toString() {
-        StringBuilder sb = new StringBuilder("\"" + getThreadName() + "\"" +
-                                             " Id=" + getThreadId() + " " +
-                                             getThreadState());
+    	StringBuilder sb = new StringBuilder();
+    	sb.append('"').append(getThreadName()).append('"')
+    	.append(" Id=").append(getThreadId()).append(' ')
+    	.append(getThreadState());
+
         if (getLockName() != null) {
-            sb.append(" on " + getLockName());
+            sb.append(" on ").append(getLockName());
         }
         if (getLockOwnerName() != null) {
-            sb.append(" owned by \"" + getLockOwnerName() +
-                      "\" Id=" + getLockOwnerId());
+            sb.append(" owned by \"").append(getLockOwnerName())
+                    .append("\" Id=").append(getLockOwnerId());
         }
         if (isSuspended()) {
             sb.append(" (suspended)");
@@ -599,21 +601,21 @@
         int i = 0;
         for (; i < stackTrace.length && i < MAX_FRAMES; i++) {
             StackTraceElement ste = stackTrace[i];
-            sb.append("\tat " + ste.toString());
+            sb.append("\tat ").append(ste.toString());
             sb.append('\n');
             if (i == 0 && getLockInfo() != null) {
                 Thread.State ts = getThreadState();
                 switch (ts) {
                     case BLOCKED:
-                        sb.append("\t-  blocked on " + getLockInfo());
+                        sb.append("\t-  blocked on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case TIMED_WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     default:
@@ -622,7 +624,7 @@
 
             for (MonitorInfo mi : lockedMonitors) {
                 if (mi.getLockedStackDepth() == i) {
-                    sb.append("\t-  locked " + mi);
+                    sb.append("\t-  locked ").append(mi);
                     sb.append('\n');
                 }
             }
@@ -634,10 +636,10 @@
 
        LockInfo[] locks = getLockedSynchronizers();
        if (locks.length > 0) {
-           sb.append("\n\tNumber of locked synchronizers = " + locks.length);
+           sb.append("\n\tNumber of locked synchronizers = ").append(locks.length);
            sb.append('\n');
            for (LockInfo li : locks) {
-               sb.append("\t- " + li);
+               sb.append("\t- ").append(li);
                sb.append('\n');
            }
        }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/rmi/dgc/VMID.java
--- a/src/share/classes/java/rmi/dgc/VMID.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/rmi/dgc/VMID.java	Tue Aug 12 08:47:10 2014 -0300
@@ -124,8 +124,7 @@
         if (addr != null)
             for (int i = 0; i < addr.length; ++ i) {
                 int x = addr[i] & 0xFF;
-                sb.append((x < 0x10 ? "0" : "") +
-                          Integer.toString(x, 16));
+                sb.append(x < 0x10 ? "0" : "").append(Integer.toString(x, 16));
             }
         sb.append(':');
         sb.append(uid.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSigner.java
--- a/src/share/classes/java/security/CodeSigner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSigner.java	Tue Aug 12 08:47:10 2014 -0300
@@ -156,9 +156,9 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("Signer: " + signerCertPath.getCertificates().get(0));
+        sb.append("Signer: ").append(signerCertPath.getCertificates().get(0));
         if (timestamp != null) {
-            sb.append("timestamp: " + timestamp);
+            sb.append("timestamp: ").append(timestamp);
         }
         sb.append(")");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSource.java
--- a/src/share/classes/java/security/CodeSource.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSource.java	Tue Aug 12 08:47:10 2014 -0300
@@ -468,12 +468,12 @@
 
         if (this.certs != null && this.certs.length > 0) {
             for (int i = 0; i < this.certs.length; i++) {
-                sb.append( " " + this.certs[i]);
+                sb.append(' ').append(this.certs[i]);
             }
 
         } else if (this.signers != null && this.signers.length > 0) {
             for (int i = 0; i < this.signers.length; i++) {
-                sb.append( " " + this.signers[i]);
+                sb.append(' ').append(this.signers[i]);
             }
         } else {
             sb.append(" <no signer certificates>");
diff -r dde9f5cfde5f src/share/classes/java/security/KeyStore.java
--- a/src/share/classes/java/security/KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/KeyStore.java	Tue Aug 12 08:47:10 2014 -0300
@@ -610,8 +610,8 @@
          */
         public String toString() {
             StringBuilder sb = new StringBuilder();
-            sb.append("Private key entry and certificate chain with "
-                + chain.length + " elements:\r\n");
+            sb.append("Private key entry and certificate chain with ")
+                    .append(chain.length).append(" elements:\r\n");
             for (Certificate cert : chain) {
                 sb.append(cert);
                 sb.append("\r\n");
diff -r dde9f5cfde5f src/share/classes/java/security/PermissionCollection.java
--- a/src/share/classes/java/security/PermissionCollection.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/PermissionCollection.java	Tue Aug 12 08:47:10 2014 -0300
@@ -179,13 +179,13 @@
     public String toString() {
         Enumeration<Permission> enum_ = elements();
         StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()+" (\n");
+        sb.append(super.toString()).append(" (\n");
         while (enum_.hasMoreElements()) {
             try {
-                sb.append(" ");
+                sb.append(' ');
                 sb.append(enum_.nextElement().toString());
-                sb.append("\n");
-            } catch (NoSuchElementException e){
+                sb.append('\n');
+            } catch (NoSuchElementException e) {
                 // ignore
             }
         }
diff -r dde9f5cfde5f src/share/classes/java/security/ProtectionDomain.java
--- a/src/share/classes/java/security/ProtectionDomain.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/ProtectionDomain.java	Tue Aug 12 08:47:10 2014 -0300
@@ -285,34 +285,32 @@
     /**
      * Convert a ProtectionDomain to a String.
      */
-    @Override public String toString() {
+	@Override
+    public String toString() {
         String pals = "<no principals>";
         if (principals != null && principals.length > 0) {
-            StringBuilder palBuf = new StringBuilder("(principals ");
+            StringBuilder palBuilder = new StringBuilder("(principals ");
 
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                            " \"" + principals[i].getName() +
-                            "\"");
-                if (i < principals.length-1)
-                    palBuf.append(",\n");
-                else
-                    palBuf.append(")\n");
+                palBuilder.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append('"');
+                if (i < principals.length - 1) {
+                    palBuilder.append(",\n");
+                } else {
+                    palBuilder.append(")\n");
+                }
             }
-            pals = palBuf.toString();
+            pals = palBuilder.toString();
         }
 
         // Check if policy is set; we don't want to load
         // the policy prematurely here
-        PermissionCollection pc = Policy.isSet() && seeAllp() ?
-                                      mergePermissions():
-                                      getPermissions();
+        PermissionCollection pc = Policy.isSet() && seeAllp() ? mergePermissions()
+                : getPermissions();
 
-        return "ProtectionDomain "+
-            " "+codesource+"\n"+
-            " "+classloader+"\n"+
-            " "+pals+"\n"+
-            " "+pc+"\n";
+        return "ProtectionDomain " + " " + codesource + "\n" + " "
+                + classloader + "\n" + " " + pals + "\n" + " " + pc + "\n";
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/java/security/Timestamp.java
--- a/src/share/classes/java/security/Timestamp.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/Timestamp.java	Tue Aug 12 08:47:10 2014 -0300
@@ -143,10 +143,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("timestamp: " + timestamp);
+        sb.append("timestamp: ").append(timestamp);
         List<? extends Certificate> certs = signerCertPath.getCertificates();
         if (!certs.isEmpty()) {
-            sb.append("TSA: " + certs.get(0));
+            sb.append("TSA: ").append(certs.get(0));
         } else {
             sb.append("TSA: <empty>");
         }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CertPath.java
--- a/src/share/classes/java/security/cert/CertPath.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CertPath.java	Tue Aug 12 08:47:10 2014 -0300
@@ -221,20 +221,16 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        Iterator<? extends Certificate> stringIterator =
-                                        getCertificates().iterator();
 
-        sb.append("\n" + type + " Cert Path: length = "
-            + getCertificates().size() + ".\n");
-        sb.append("[\n");
+        sb.append('\n').append(type).append(" Cert Path: length = ")
+                .append(getCertificates().size()).append(".\n").append("[\n");
         int i = 1;
-        while (stringIterator.hasNext()) {
+        for (Certificate stringCert : getCertificates()) {
             sb.append("=========================================="
-                + "===============Certificate " + i + " start.\n");
-            Certificate stringCert = stringIterator.next();
+                 + "===============Certificate ").append(i).append(" start.\n");
             sb.append(stringCert.toString());
             sb.append("\n========================================"
-                + "=================Certificate " + i + " end.\n\n\n");
+                + "=================Certificate ").append(i).append(" end.\n\n\n");
             i++;
         }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CollectionCertStoreParameters.java
--- a/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Tue Aug 12 08:47:10 2014 -0300
@@ -134,8 +134,8 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CollectionCertStoreParameters: [\n");
-        sb.append("  collection: " + coll + "\n");
-        sb.append("]");
+        sb.append("  collection: ").append(coll).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/LDAPCertStoreParameters.java
--- a/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Tue Aug 12 08:47:10 2014 -0300
@@ -141,9 +141,9 @@
         StringBuilder sb = new StringBuilder();
         sb.append("LDAPCertStoreParameters: [\n");
 
-        sb.append("  serverName: " + serverName + "\n");
-        sb.append("  port: " + port + "\n");
-        sb.append("]");
+        sb.append("  serverName: ").append(serverName).append('\n');
+        sb.append("  port: ").append(port).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXBuilderParameters.java
--- a/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Tue Aug 12 08:47:10 2014 -0300
@@ -192,7 +192,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Maximum Path Length: " + maxPathLength + "\n");
+        sb.append("  Maximum Path Length: ").append(maxPathLength).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Tue Aug 12 08:47:10 2014 -0300
@@ -109,11 +109,13 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathBuilderResult: [\n");
-        sb.append("  Certification Path: " + certPath + "\n");
-        sb.append("  Trust Anchor: " + getTrustAnchor().toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(getPolicyTree()) + "\n");
-        sb.append("  Subject Public Key: " + getPublicKey() + "\n");
-        sb.append("]");
+        sb.append("  Certification Path: ").append(certPath).append('\n');
+        sb.append("  Trust Anchor: ").append(getTrustAnchor().toString())
+                .append('\n');
+        sb.append("  Policy Tree: ").append(String.valueOf(getPolicyTree()))
+                .append('\n');
+        sb.append("  Subject Public Key: ").append(getPublicKey()).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Tue Aug 12 08:47:10 2014 -0300
@@ -150,10 +150,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathValidatorResult: [\n");
-        sb.append("  Trust Anchor: " + trustAnchor.toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(policyTree) + "\n");
-        sb.append("  Subject Public Key: " + subjectPublicKey + "\n");
-        sb.append("]");
+        sb.append("  Trust Anchor: ").append(trustAnchor.toString()).append('\n');
+        sb.append("  Policy Tree: ").append(String.valueOf(policyTree)).append('\n');
+        sb.append("  Subject Public Key: ").append(subjectPublicKey).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXParameters.java
--- a/src/share/classes/java/security/cert/PKIXParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXParameters.java	Tue Aug 12 08:47:10 2014 -0300
@@ -698,8 +698,8 @@
 
         /* start with trusted anchor info */
         if (unmodTrustAnchors != null) {
-            sb.append("  Trust Anchors: " + unmodTrustAnchors.toString()
-                + "\n");
+            sb.append("  Trust Anchors: ").append(unmodTrustAnchors.toString())
+                    .append('\n');
         }
 
         /* now, append initial state information */
@@ -707,30 +707,41 @@
             if (unmodInitialPolicies.isEmpty()) {
                 sb.append("  Initial Policy OIDs: any\n");
             } else {
-                sb.append("  Initial Policy OIDs: ["
-                    + unmodInitialPolicies.toString() + "]\n");
+                sb.append("  Initial Policy OIDs: [")
+                        .append(unmodInitialPolicies.toString()).append("]\n");
             }
         }
 
         /* now, append constraints on all certificates in the path */
-        sb.append("  Validity Date: " + String.valueOf(date) + "\n");
-        sb.append("  Signature Provider: " + String.valueOf(sigProvider) + "\n");
-        sb.append("  Default Revocation Enabled: " + revocationEnabled + "\n");
-        sb.append("  Explicit Policy Required: " + explicitPolicyRequired + "\n");
-        sb.append("  Policy Mapping Inhibited: " + policyMappingInhibited + "\n");
-        sb.append("  Any Policy Inhibited: " + anyPolicyInhibited + "\n");
-        sb.append("  Policy Qualifiers Rejected: " + policyQualifiersRejected + "\n");
+        sb.append("  Validity Date: ").append(String.valueOf(date))
+                .append('\n');
+        sb.append("  Signature Provider: ").append(String.valueOf(sigProvider))
+                .append('\n');
+        sb.append("  Default Revocation Enabled: ").append(revocationEnabled)
+                .append('\n');
+        sb.append("  Explicit Policy Required: ")
+                .append(explicitPolicyRequired).append('\n');
+        sb.append("  Policy Mapping Inhibited: ")
+                .append(policyMappingInhibited).append('\n');
+        sb.append("  Any Policy Inhibited: ").append(anyPolicyInhibited)
+                .append('\n');
+        sb.append("  Policy Qualifiers Rejected: ")
+                .append(policyQualifiersRejected).append('\n');
 
         /* now, append target cert requirements */
-        sb.append("  Target Cert Constraints: " + String.valueOf(certSelector) + "\n");
+        sb.append("  Target Cert Constraints: ")
+                .append(String.valueOf(certSelector)).append('\n');
 
         /* finally, append miscellaneous parameters */
-        if (certPathCheckers != null)
-            sb.append("  Certification Path Checkers: ["
-                + certPathCheckers.toString() + "]\n");
-        if (certStores != null)
-            sb.append("  CertStores: [" + certStores.toString() + "]\n");
-        sb.append("]");
+        if (certPathCheckers != null) {
+            sb.append("  Certification Path Checkers: [")
+                    .append(certPathCheckers.toString()).append("]\n");
+        }
+        if (certStores != null) {
+            sb.append("  CertStores: [").append(certStores.toString())
+                    .append("]\n");
+        }
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PolicyQualifierInfo.java
--- a/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Tue Aug 12 08:47:10 2014 -0300
@@ -158,15 +158,17 @@
      *         {@code PolicyQualifierInfo}
      */
     public String toString() {
-        if (pqiString != null)
+        if (pqiString != null) {
             return pqiString;
+        }
         HexDumpEncoder enc = new HexDumpEncoder();
         StringBuilder sb = new StringBuilder();
         sb.append("PolicyQualifierInfo: [\n");
-        sb.append("  qualifierID: " + mId + "\n");
-        sb.append("  qualifier: " +
-            (mData == null ? "null" : enc.encodeBuffer(mData)) + "\n");
-        sb.append("]");
+        sb.append("  qualifierID: ").append(mId).append('\n');
+        sb.append("  qualifier: ")
+                .append(mData == null ? "null" : enc.encodeBuffer(mData))
+                .append('\n');
+        sb.append(']');
         pqiString = sb.toString();
         return pqiString;
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/TrustAnchor.java
--- a/src/share/classes/java/security/cert/TrustAnchor.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/TrustAnchor.java	Tue Aug 12 08:47:10 2014 -0300
@@ -320,14 +320,18 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         if (pubKey != null) {
-            sb.append("  Trusted CA Public Key: " + pubKey.toString() + "\n");
-            sb.append("  Trusted CA Issuer Name: "
-                + String.valueOf(caName) + "\n");
+            sb.append("  Trusted CA Public Key: ").append(pubKey.toString())
+                    .append('\n');
+            sb.append("  Trusted CA Issuer Name: ")
+                    .append(String.valueOf(caName)).append('\n');
         } else {
-            sb.append("  Trusted CA cert: " + trustedCert.toString() + "\n");
+            sb.append("  Trusted CA cert: ").append(trustedCert.toString())
+                    .append('\n');
         }
-        if (nc != null)
-            sb.append("  Name Constraints: " + nc.toString() + "\n");
+        if (nc != null) {
+            sb.append("  Name Constraints: ").append(nc.toString())
+                    .append('\n');
+        }
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CRLSelector.java
--- a/src/share/classes/java/security/cert/X509CRLSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CRLSelector.java	Tue Aug 12 08:47:10 2014 -0300
@@ -572,17 +572,17 @@
             sb.append("  IssuerNames:\n");
             Iterator<Object> i = issuerNames.iterator();
             while (i.hasNext())
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
         }
         if (minCRL != null)
-            sb.append("  minCRLNumber: " + minCRL + "\n");
+            sb.append("  minCRLNumber: ").append(minCRL).append('\n');
         if (maxCRL != null)
-            sb.append("  maxCRLNumber: " + maxCRL + "\n");
+            sb.append("  maxCRLNumber: ").append(maxCRL).append('\n');
         if (dateAndTime != null)
-            sb.append("  dateAndTime: " + dateAndTime + "\n");
+            sb.append("  dateAndTime: ").append(dateAndTime).append('\n');
         if (certChecking != null)
-            sb.append("  Certificate being checked: " + certChecking + "\n");
-        sb.append("]");
+            sb.append("  Certificate being checked: ").append(certChecking).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CertSelector.java
--- a/src/share/classes/java/security/cert/X509CertSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CertSelector.java	Tue Aug 12 08:47:10 2014 -0300
@@ -1814,72 +1814,75 @@
         StringBuilder sb = new StringBuilder();
         sb.append("X509CertSelector: [\n");
         if (x509Cert != null) {
-            sb.append("  Certificate: " + x509Cert.toString() + "\n");
+            sb.append("  Certificate: ").append(x509Cert.toString())
+                    .append('\n');
         }
         if (serialNumber != null) {
-            sb.append("  Serial Number: " + serialNumber.toString() + "\n");
+            sb.append("  Serial Number: ").append(serialNumber.toString())
+                    .append('\n');
         }
         if (issuer != null) {
-            sb.append("  Issuer: " + getIssuerAsString() + "\n");
+            sb.append("  Issuer: ").append(getIssuerAsString()).append('\n');
         }
         if (subject != null) {
-            sb.append("  Subject: " + getSubjectAsString() + "\n");
+            sb.append("  Subject: ").append(getSubjectAsString()).append('\n');
         }
-        sb.append("  matchAllSubjectAltNames flag: "
-                  + String.valueOf(matchAllSubjectAltNames) + "\n");
+        sb.append("  matchAllSubjectAltNames flag: ")
+                .append(String.valueOf(matchAllSubjectAltNames)).append('\n');
         if (subjectAlternativeNames != null) {
             sb.append("  SubjectAlternativeNames:\n");
             Iterator<List<?>> i = subjectAlternativeNames.iterator();
             while (i.hasNext()) {
                 List<?> list = i.next();
-                sb.append("    type " + list.get(0) +
-                          ", name " + list.get(1) + "\n");
+                sb.append("    type ").append(list.get(0)).append(", name ")
+                        .append(list.get(1)).append('\n');
             }
         }
         if (subjectKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Subject Key Identifier: " +
-                      enc.encodeBuffer(subjectKeyID) + "\n");
+            sb.append("  Subject Key Identifier: ")
+                    .append(enc.encodeBuffer(subjectKeyID)).append('\n');
         }
         if (authorityKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Authority Key Identifier: " +
-                      enc.encodeBuffer(authorityKeyID) + "\n");
+            sb.append("  Authority Key Identifier: ")
+                    .append(enc.encodeBuffer(authorityKeyID)).append('\n');
         }
         if (certificateValid != null) {
-            sb.append("  Certificate Valid: " +
-                      certificateValid.toString() + "\n");
+            sb.append("  Certificate Valid: ")
+                    .append(certificateValid.toString()).append('\n');
         }
         if (privateKeyValid != null) {
-            sb.append("  Private Key Valid: " +
-                      privateKeyValid.toString() + "\n");
+            sb.append("  Private Key Valid: ")
+                    .append(privateKeyValid.toString()).append('\n');
         }
         if (subjectPublicKeyAlgID != null) {
-            sb.append("  Subject Public Key AlgID: " +
-                      subjectPublicKeyAlgID.toString() + "\n");
+            sb.append("  Subject Public Key AlgID: ")
+                    .append(subjectPublicKeyAlgID.toString()).append('\n');
         }
         if (subjectPublicKey != null) {
-            sb.append("  Subject Public Key: " +
-                      subjectPublicKey.toString() + "\n");
+            sb.append("  Subject Public Key: ")
+                    .append(subjectPublicKey.toString()).append('\n');
         }
         if (keyUsage != null) {
-            sb.append("  Key Usage: " + keyUsageToString(keyUsage) + "\n");
+            sb.append("  Key Usage: ").append(keyUsageToString(keyUsage))
+                    .append('\n');
         }
         if (keyPurposeSet != null) {
-            sb.append("  Extended Key Usage: " +
-                      keyPurposeSet.toString() + "\n");
+            sb.append("  Extended Key Usage: ")
+                    .append(keyPurposeSet.toString()).append('\n');
         }
         if (policy != null) {
-            sb.append("  Policy: " + policy.toString() + "\n");
+            sb.append("  Policy: ").append(policy.toString()).append('\n');
         }
         if (pathToGeneralNames != null) {
             sb.append("  Path to names:\n");
             Iterator<GeneralNameInterface> i = pathToGeneralNames.iterator();
             while (i.hasNext()) {
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
             }
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/text/ChoiceFormat.java
--- a/src/share/classes/java/text/ChoiceFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/text/ChoiceFormat.java	Tue Aug 12 08:47:11 2014 -0300
@@ -272,7 +272,7 @@
             double tryLess = Math.abs(Math.IEEEremainder(less, 1.0d));
 
             if (tryLessOrEqual < tryLess) {
-                result.append(""+choiceLimits[i]);
+                result.append(choiceLimits[i]);
                 result.append('#');
             } else {
                 if (choiceLimits[i] == Double.POSITIVE_INFINITY) {
@@ -280,7 +280,7 @@
                 } else if (choiceLimits[i] == Double.NEGATIVE_INFINITY) {
                     result.append("-\u221E");
                 } else {
-                    result.append(""+less);
+                    result.append(less);
                 }
                 result.append('<');
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/util/Scanner.java
--- a/src/share/classes/java/util/Scanner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/Scanner.java	Tue Aug 12 08:47:11 2014 -0300
@@ -1304,20 +1304,20 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.Scanner");
-        sb.append("[delimiters=" + delimPattern + "]");
-        sb.append("[position=" + position + "]");
-        sb.append("[match valid=" + matchValid + "]");
-        sb.append("[need input=" + needInput + "]");
-        sb.append("[source closed=" + sourceClosed + "]");
-        sb.append("[skipped=" + skipped + "]");
-        sb.append("[group separator=" + groupSeparator + "]");
-        sb.append("[decimal separator=" + decimalSeparator + "]");
-        sb.append("[positive prefix=" + positivePrefix + "]");
-        sb.append("[negative prefix=" + negativePrefix + "]");
-        sb.append("[positive suffix=" + positiveSuffix + "]");
-        sb.append("[negative suffix=" + negativeSuffix + "]");
-        sb.append("[NaN string=" + nanString + "]");
-        sb.append("[infinity string=" + infinityString + "]");
+        sb.append("[delimiters=").append(delimPattern).append(']');
+        sb.append("[position=").append(position).append(']');
+        sb.append("[match valid=").append(matchValid).append(']');
+        sb.append("[need input=").append(needInput).append(']');
+        sb.append("[source closed=").append(sourceClosed).append(']');
+        sb.append("[skipped=").append(skipped).append(']');
+        sb.append("[group separator=").append(groupSeparator).append(']');
+        sb.append("[decimal separator=").append(decimalSeparator).append(']');
+        sb.append("[positive prefix=").append(positivePrefix).append(']');
+        sb.append("[negative prefix=").append(negativePrefix).append(']');
+        sb.append("[positive suffix=").append(positiveSuffix).append(']');
+        sb.append("[negative suffix=").append(negativeSuffix).append(']');
+        sb.append("[NaN string=").append(nanString).append(']');
+        sb.append("[infinity string=").append(infinityString).append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Matcher.java
--- a/src/share/classes/java/util/regex/Matcher.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Matcher.java	Tue Aug 12 08:47:11 2014 -0300
@@ -1295,14 +1295,14 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.regex.Matcher");
-        sb.append("[pattern=" + pattern());
+        sb.append("[pattern=").append(pattern());
         sb.append(" region=");
-        sb.append(regionStart() + "," + regionEnd());
+        sb.append(regionStart()).append(',').append(regionEnd());
         sb.append(" lastmatch=");
         if ((first >= 0) && (group() != null)) {
             sb.append(group());
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Pattern.java
--- a/src/share/classes/java/util/regex/Pattern.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Pattern.java	Tue Aug 12 08:47:11 2014 -0300
@@ -1488,10 +1488,10 @@
         for(int x=0; x<perms.length; x++) {
             String next = base + perms[x];
             if (x>0)
-                result.append("|"+next);
+                result.append('|').append(next);
             next = composeOneStep(next);
             if (next != null)
-                result.append("|"+produceEquivalentAlternation(next));
+                result.append('|').append(produceEquivalentAlternation(next));
         }
         return result.toString();
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/management/MBeanPermission.java
--- a/src/share/classes/javax/management/MBeanPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/MBeanPermission.java	Tue Aug 12 08:47:11 2014 -0300
@@ -455,11 +455,11 @@
         name.append(className);
         if (member == null)
             member = "-";
-        name.append("#" + member);
+        name.append('#').append(member);
         if (objectName == null)
             name.append("[-]");
         else
-            name.append("[").append(objectName.getCanonicalName()).append("]");
+            name.append('[').append(objectName.getCanonicalName()).append(']');
 
         /* In the interests of legibility for Permission.toString(), we
            transform the empty string into "*".  */
diff -r dde9f5cfde5f src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
--- a/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Aug 12 08:47:11 2014 -0300
@@ -716,15 +716,14 @@
         }
 
         retStr.append("\nMBeanInfo for ModelMBean is:");
-        retStr.append("\nCLASSNAME: \t"+ info.getClassName());
-        retStr.append("\nDESCRIPTION: \t"+ info.getDescription());
+        retStr.append("\nCLASSNAME: \t").append(info.getClassName());
+        retStr.append("\nDESCRIPTION: \t").append(info.getDescription());
 
 
         try {
-            retStr.append("\nMBEAN DESCRIPTOR: \t"+
-                          info.getMBeanDescriptor());
+            retStr.append("\nMBEAN DESCRIPTOR: \t").append(info.getMBeanDescriptor());
         } catch (Exception e) {
-            retStr.append("\nMBEAN DESCRIPTOR: \t" + " is invalid");
+            retStr.append("\nMBEAN DESCRIPTOR: \t  is invalid");
         }
 
         retStr.append("\nATTRIBUTES");
@@ -734,13 +733,12 @@
             for (int i=0; i<attrInfo.length; i++) {
                 final ModelMBeanAttributeInfo attInfo =
                     (ModelMBeanAttributeInfo)attrInfo[i];
-                retStr.append(" ** NAME: \t"+ attInfo.getName());
-                retStr.append("    DESCR: \t"+ attInfo.getDescription());
-                retStr.append("    TYPE: \t"+ attInfo.getType() +
-                              "    READ: \t"+ attInfo.isReadable() +
-                              "    WRITE: \t"+ attInfo.isWritable());
-                retStr.append("    DESCRIPTOR: " +
-                              attInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(attInfo.getName());
+                retStr.append("    DESCR: \t").append(attInfo.getDescription());
+                retStr.append("    TYPE: \t").append(attInfo.getType())
+                        .append("    READ: \t").append(attInfo.isReadable())
+                        .append("    WRITE: \t").append(attInfo.isWritable());
+                retStr.append("    DESCRIPTOR: ").append(attInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No attributes **");
@@ -752,14 +750,12 @@
             for (int i=0; i<constrInfo.length; i++) {
                 final ModelMBeanConstructorInfo ctorInfo =
                     (ModelMBeanConstructorInfo)constrInfo[i];
-                retStr.append(" ** NAME: \t"+ ctorInfo.getName());
-                retStr.append("    DESCR: \t"+
-                              ctorInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              ctorInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              ctorInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(ctorInfo.getName());
+                retStr.append("    DESCR: \t").append(ctorInfo.getDescription());
+                retStr.append("    PARAM: \t").append(ctorInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ")
+                        .append(ctorInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No Constructors **");
@@ -771,13 +767,11 @@
             for (int i=0; i<opsInfo.length; i++) {
                 final ModelMBeanOperationInfo operInfo =
                     (ModelMBeanOperationInfo)opsInfo[i];
-                retStr.append(" ** NAME: \t"+ operInfo.getName());
-                retStr.append("    DESCR: \t"+ operInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              operInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              operInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(operInfo.getName());
+                retStr.append("    DESCR: \t").append(operInfo.getDescription());
+                retStr.append("    PARAM: \t").append(operInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ").append(operInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No operations ** ");
@@ -790,10 +784,9 @@
             for (int i=0; i<notifInfo.length; i++) {
                 final ModelMBeanNotificationInfo nInfo =
                     (ModelMBeanNotificationInfo)notifInfo[i];
-                retStr.append(" ** NAME: \t"+ nInfo.getName());
-                retStr.append("    DESCR: \t"+ nInfo.getDescription());
-                retStr.append("    DESCRIPTOR: " +
-                              nInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(nInfo.getName());
+                retStr.append("    DESCR: \t").append(nInfo.getDescription());
+                retStr.append("    DESCRIPTOR: ").append(nInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No notifications **");
diff -r dde9f5cfde5f src/share/classes/javax/management/openmbean/CompositeType.java
--- a/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Aug 12 08:47:11 2014 -0300
@@ -463,7 +463,7 @@
                 result.append("(itemName=");
                 result.append(key);
                 result.append(",itemType=");
-                result.append(nameToType.get(key).toString() +")");
+                result.append(nameToType.get(key).toString()).append(')');
                 i++;
             }
             result.append("))");
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/Role.java
--- a/src/share/classes/javax/management/relation/Role.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/Role.java	Tue Aug 12 08:47:11 2014 -0300
@@ -226,17 +226,17 @@
      * @return the description of the role.
      */
     public String toString() {
-        StringBuilder result = new StringBuilder();
-        result.append("role name: " + name + "; role value: ");
-        for (Iterator<ObjectName> objNameIter = objectNameList.iterator();
-             objNameIter.hasNext();) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("role name: ").append(name).append("; role value: ");
+        for (Iterator<ObjectName> objNameIter = objectNameList.iterator(); objNameIter
+                .hasNext();) {
             ObjectName currObjName = objNameIter.next();
-            result.append(currObjName.toString());
+            sb.append(currObjName.toString());
             if (objNameIter.hasNext()) {
-                result.append(", ");
+                sb.append(", ");
             }
         }
-        return result.toString();
+        return sb.toString();
     }
 
     //
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleInfo.java
--- a/src/share/classes/javax/management/relation/RoleInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleInfo.java	Tue Aug 12 08:47:11 2014 -0300
@@ -456,13 +456,13 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role info name: " + name);
-        result.append("; isReadable: " + isReadable);
-        result.append("; isWritable: " + isWritable);
-        result.append("; description: " + description);
-        result.append("; minimum degree: " + minDegree);
-        result.append("; maximum degree: " + maxDegree);
-        result.append("; MBean class: " + referencedMBeanClassName);
+        result.append("role info name: ").append(name);
+        result.append("; isReadable: ").append(isReadable);
+        result.append("; isWritable: ").append(isWritable);
+        result.append("; description: ").append(description);
+        result.append("; minimum degree: ").append(minDegree);
+        result.append("; maximum degree: ").append(maxDegree);
+        result.append("; MBean class: ").append(referencedMBeanClassName);
         return result.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleUnresolved.java
--- a/src/share/classes/javax/management/relation/RoleUnresolved.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleUnresolved.java	Tue Aug 12 08:47:11 2014 -0300
@@ -282,7 +282,7 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role name: " + roleName);
+        result.append("role name: ").append(roleName);
         if (roleValue != null) {
             result.append("; value: ");
             for (Iterator<ObjectName> objNameIter = roleValue.iterator();
@@ -294,7 +294,7 @@
                 }
             }
         }
-        result.append("; problem type: " + problemType);
+        result.append("; problem type: ").append(problemType);
         return result.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/crypto/CryptoPermission.java
--- a/src/share/classes/javax/crypto/CryptoPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/crypto/CryptoPermission.java	Tue Aug 12 08:47:11 2014 -0300
@@ -369,22 +369,24 @@
      * @return information about this CryptoPermission.
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder(100);
-        buf.append("(CryptoPermission " + alg + " " + maxKeySize);
+        StringBuilder sb = new StringBuilder(100);
+        sb.append("(CryptoPermission ").append(alg).append(' ')
+                .append(maxKeySize);
         if (algParamSpec != null) {
             if (algParamSpec instanceof RC2ParameterSpec) {
-                buf.append(" , effective " +
-                    ((RC2ParameterSpec)algParamSpec).getEffectiveKeyBits());
+                sb.append(" , effective ")
+                        .append(((RC2ParameterSpec) algParamSpec)
+                                .getEffectiveKeyBits());
             } else if (algParamSpec instanceof RC5ParameterSpec) {
-                buf.append(" , rounds " +
-                    ((RC5ParameterSpec)algParamSpec).getRounds());
+                sb.append(" , rounds ").append(
+                        ((RC5ParameterSpec) algParamSpec).getRounds());
             }
         }
         if (exemptionMechanism != null) { // OPTIONAL
-            buf.append(" " + exemptionMechanism);
+            sb.append(' ').append(exemptionMechanism);
         }
-        buf.append(")");
-        return buf.toString();
+        sb.append(')');
+        return sb.toString();
     }
 
     private boolean impliesExemptionMechanism(String exemptionMechanism) {
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/naming/BinaryRefAddr.java
--- a/src/share/classes/javax/naming/BinaryRefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/BinaryRefAddr.java	Tue Aug 12 08:47:11 2014 -0300
@@ -165,11 +165,11 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Address Type: " + addrType + "\n");
-
+        StringBuilder str = new StringBuilder();
+        str.append("Address Type: ").append(addrType).append('\n');
         str.append("AddressContents: ");
         for (int i = 0; i<buf.length && i < 32; i++) {
-            str.append(Integer.toHexString(buf[i]) +" ");
+            str.append(Integer.toHexString(buf[i])).append(' ');
         }
         if (buf.length >= 32)
             str.append(" ...\n");
diff -r dde9f5cfde5f src/share/classes/javax/naming/NameImpl.java
--- a/src/share/classes/javax/naming/NameImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/NameImpl.java	Tue Aug 12 08:47:11 2014 -0300
@@ -170,7 +170,7 @@
                 endQuote = one ? syntaxEndQuote1 : syntaxEndQuote2;
 
                 i += syntaxTypevalSeparator.length();
-                answer.append(syntaxTypevalSeparator+beginQuote); // add back
+                answer.append(syntaxTypevalSeparator).append(beginQuote); // add back
 
                 // consume string until matching quote
                 for (i += beginQuote.length();
diff -r dde9f5cfde5f src/share/classes/javax/naming/RefAddr.java
--- a/src/share/classes/javax/naming/RefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/RefAddr.java	Tue Aug 12 08:47:11 2014 -0300
@@ -139,9 +139,9 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Type: " + addrType + "\n");
-
-        str.append("Content: " + getContent() + "\n");
+        StringBuilder str = new StringBuilder();
+        str.append("Type: ").append(addrType).append('\n');
+        str.append("Content: ").append(getContent()).append('\n');
         return (str.toString());
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
--- a/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Tue Aug 12 08:47:11 2014 -0300
@@ -651,8 +651,7 @@
         StringBuilder caddrString = new StringBuilder();
         if (clientAddresses != null) {
             for (int i = 0; i < clientAddresses.length; i++) {
-                caddrString.append("clientAddresses[" + i + "] = " +
-                        clientAddresses[i].toString());
+                caddrString.append("clientAddresses[").append(i).append("] = ").append(clientAddresses[i].toString());
             }
         }
         return ("Ticket (hex) = " + "\n" +
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/AudioFileFormat.java
--- a/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Tue Aug 12 08:47:11 2014 -0300
@@ -272,26 +272,25 @@
     @Override
     public String toString() {
 
-        StringBuffer buf = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         //$$fb2002-11-01: fix for 4672864: AudioFileFormat.toString() throws unexpected NullPointerException
         if (type != null) {
-            buf.append(type.toString() + " (." + type.getExtension() + ") file");
+            sb.append(type.toString()).append(" (.").append(type.getExtension()).append(") file");
         } else {
-            buf.append("unknown file format");
+            sb.append("unknown file format");
         }
 
         if (byteLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", byte length: " + byteLength);
+            sb.append(", byte length: ").append(byteLength);
         }
 
-        buf.append(", data format: " + format);
+        sb.append(", data format: ").append(format);
 
         if (frameLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", frame length: " + frameLength);
+            sb.append(", frame length: ").append(frameLength);
         }
-
-        return new String(buf);
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/DataLine.java
--- a/src/share/classes/javax/sound/sampled/DataLine.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/DataLine.java	Tue Aug 12 08:47:11 2014 -0300
@@ -473,17 +473,21 @@
             StringBuilder sb = new StringBuilder();
 
             if ( (formats.length == 1) && (formats[0] != null) ) {
-                sb.append(" supporting format " + formats[0]);
+                sb.append(" supporting format ").append(formats[0]);
             } else if (getFormats().length > 1) {
-                sb.append(" supporting " + getFormats().length + " audio formats");
+				sb.append(" supporting ").append(getFormats().length)
+						.append(" audio formats");
             }
 
             if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (maxBufferSize != AudioSystem.NOT_SPECIFIED) ) {
-                sb.append(", and buffers of " + minBufferSize + " to " + maxBufferSize + " bytes");
+				sb.append(", and buffers of ").append(minBufferSize)
+						.append(" to ").append(maxBufferSize).append(" bytes");
             } else if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (minBufferSize > 0) ) {
-                sb.append(", and buffers of at least " + minBufferSize + " bytes");
+				sb.append(", and buffers of at least ").append(minBufferSize)
+						.append(" bytes");
             } else if (maxBufferSize != AudioSystem.NOT_SPECIFIED) {
-                sb.append(", and buffers of up to " + minBufferSize + " bytes");
+				sb.append(", and buffers of up to ").append(minBufferSize)
+						.append(" bytes");
             }
 
             return new String(super.toString() + sb);
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/swing/GroupLayout.java
--- a/src/share/classes/javax/swing/GroupLayout.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/GroupLayout.java	Tue Aug 12 08:47:12 2014 -0300
@@ -1213,15 +1213,15 @@
             registerComponents(horizontalGroup, HORIZONTAL);
             registerComponents(verticalGroup, VERTICAL);
         }
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("HORIZONTAL\n");
-        createSpringDescription(buffer, horizontalGroup, "  ", HORIZONTAL);
-        buffer.append("\nVERTICAL\n");
-        createSpringDescription(buffer, verticalGroup, "  ", VERTICAL);
-        return buffer.toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append("HORIZONTAL\n");
+        createSpringDescription(sb, horizontalGroup, "  ", HORIZONTAL);
+        sb.append("\nVERTICAL\n");
+        createSpringDescription(sb, verticalGroup, "  ", VERTICAL);
+        return sb.toString();
     }
 
-    private void createSpringDescription(StringBuffer buffer, Spring spring,
+    private void createSpringDescription(StringBuilder sb, Spring spring,
             String indent, int axis) {
         String origin = "";
         String padding = "";
@@ -1239,20 +1239,19 @@
             padding = ", userCreated=" + paddingSpring.getUserCreated() +
                     ", matches=" + paddingSpring.getMatchDescription();
         }
-        buffer.append(indent + spring.getClass().getName() + " " +
-                Integer.toHexString(spring.hashCode()) + " " +
-                origin +
-                ", size=" + spring.getSize() +
-                ", alignment=" + spring.getAlignment() +
-                " prefs=[" + spring.getMinimumSize(axis) +
-                " " + spring.getPreferredSize(axis) +
-                " " + spring.getMaximumSize(axis) +
-                padding + "]\n");
+		sb.append(indent).append(spring.getClass().getName()).append(' ')
+				.append(Integer.toHexString(spring.hashCode())).append(' ')
+				.append(origin).append(", size=").append(spring.getSize())
+				.append(", alignment=").append(spring.getAlignment())
+				.append(" prefs=[").append(spring.getMinimumSize(axis))
+				.append(' ').append(spring.getPreferredSize(axis)).append(' ')
+				.append(spring.getMaximumSize(axis)).append(padding)
+				.append("]\n");
         if (spring instanceof Group) {
             List<Spring> springs = ((Group)spring).springs;
             indent += "  ";
             for (int counter = 0; counter < springs.size(); counter++) {
-                createSpringDescription(buffer, springs.get(counter), indent,
+                createSpringDescription(sb, springs.get(counter), indent,
                         axis);
             }
         }
diff -r dde9f5cfde5f src/share/classes/javax/swing/JColorChooser.java
--- a/src/share/classes/javax/swing/JColorChooser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/JColorChooser.java	Tue Aug 12 08:47:12 2014 -0300
@@ -542,19 +542,19 @@
      *
      * @return  a string representation of this <code>JColorChooser</code>
      */
-    protected String paramString() {
-        StringBuilder chooserPanelsString = new StringBuilder("");
-        for (int i=0; i<chooserPanels.length; i++) {
-            chooserPanelsString.append("[" + chooserPanels[i].toString()
-                                       + "]");
-        }
-        String previewPanelString = (previewPanel != null ?
-                                     previewPanel.toString() : "");
+	protected String paramString() {
+		StringBuilder chooserPanelsString = new StringBuilder();
+		for (AbstractColorChooserPanel panel : chooserPanels) {
+			chooserPanelsString.append('[').append(panel.toString())
+					.append(']');
+		}
+		String previewPanelString = (previewPanel != null ? previewPanel
+				.toString() : "");
 
-        return super.paramString() +
-        ",chooserPanels=" + chooserPanelsString.toString() +
-        ",previewPanel=" + previewPanelString;
-    }
+		return super.paramString() + ",chooserPanels="
+				+ chooserPanelsString.toString() + ",previewPanel="
+				+ previewPanelString;
+	}
 
 /////////////////
 // Accessibility support
diff -r dde9f5cfde5f src/share/classes/javax/swing/MultiUIDefaults.java
--- a/src/share/classes/javax/swing/MultiUIDefaults.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/MultiUIDefaults.java	Tue Aug 12 08:47:12 2014 -0300
@@ -190,18 +190,18 @@
 
     @Override
     public synchronized String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("{");
-        Enumeration<?> keys = keys();
-        while (keys.hasMoreElements()) {
-            Object key = keys.nextElement();
-            sb.append(key + "=" + get(key) + ", ");
-        }
-        int length = sb.length();
-        if (length > 1) {
-            sb.delete(length-2, length);
-        }
-        sb.append("}");
-        return sb.toString();
+		StringBuilder sb = new StringBuilder();
+		sb.append("{");
+		Enumeration<?> keys = keys();
+		while (keys.hasMoreElements()) {
+			Object key = keys.nextElement();
+			sb.append(key).append('=').append(get(key)).append(", ");
+		}
+		int length = sb.length();
+		if (length > 1) {
+			sb.delete(length - 2, length);
+		}
+		sb.append('}');
+		return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/javax/swing/RepaintManager.java
--- a/src/share/classes/javax/swing/RepaintManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/RepaintManager.java	Tue Aug 12 08:47:12 2014 -0300
@@ -990,10 +990,7 @@
      * @return a String representation of this object
      */
     public synchronized String toString() {
-        StringBuilder sb = new StringBuilder();
-        if(dirtyComponents != null)
-            sb.append("" + dirtyComponents);
-        return sb.toString();
+		return dirtyComponents != null ? dirtyComponents.toString() : "";
     }
 
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/event/TreeModelEvent.java
--- a/src/share/classes/javax/swing/event/TreeModelEvent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/event/TreeModelEvent.java	Tue Aug 12 08:47:12 2014 -0300
@@ -294,21 +294,20 @@
     public String toString() {
         StringBuilder   sb = new StringBuilder();
 
-        sb.append(getClass().getName() + " " +
-                  Integer.toString(hashCode()));
+        sb.append(getClass().getName()).append(' ').append(Integer.toString(hashCode()));
         if(path != null)
-            sb.append(" path " + path);
+            sb.append(" path ").append(path);
         if(childIndices != null) {
             sb.append(" indices [ ");
             for(int counter = 0; counter < childIndices.length; counter++)
-                sb.append(Integer.toString(childIndices[counter])+ " ");
-            sb.append("]");
+                sb.append(Integer.toString(childIndices[counter])).append(' ');
+            sb.append(']');
         }
         if(children != null) {
             sb.append(" children [ ");
             for(int counter = 0; counter < children.length; counter++)
-                sb.append(children[counter] + " ");
-            sb.append("]");
+                sb.append(children[counter]).append(' ');
+            sb.append(']');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Aug 12 08:47:12 2014 -0300
@@ -1330,8 +1330,8 @@
 
             for (Object obj : values) {
                 String val = ((obj == null) ? "" : obj.toString());
-                plainBuf.append(val + "\n");
-                htmlBuf.append("  <li>" + val + "\n");
+                plainBuf.append(val).append('\n');
+                htmlBuf.append("  <li>").append(val).append('\n');
             }
 
             // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicListUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Tue Aug 12 08:47:12 2014 -0300
@@ -2948,8 +2948,8 @@
                 for (int i = 0; i < values.length; i++) {
                     Object obj = values[i];
                     String val = ((obj == null) ? "" : obj.toString());
-                    plainStr.append(val + "\n");
-                    htmlStr.append("  <li>" + val + "\n");
+                    plainStr.append(val).append('\n');
+                    htmlStr.append("  <li>").append(val).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTableUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Tue Aug 12 08:47:12 2014 -0300
@@ -2230,11 +2230,11 @@
                     for (int col = 0; col < cols.length; col++) {
                         Object obj = table.getValueAt(rows[row], cols[col]);
                         String val = ((obj == null) ? "" : obj.toString());
-                        plainStr.append(val + "\t");
-                        htmlStr.append("  <td>" + val + "</td>\n");
+                        plainStr.append(val).append('\t');
+                        htmlStr.append("  <td>").append(val).append("</td>\n");
                     }
                     // we want a newline at the end of each line and not a tab
-                    plainStr.deleteCharAt(plainStr.length() - 1).append("\n");
+                    plainStr.deleteCharAt(plainStr.length() - 1).append('\t');
                     htmlStr.append("</tr>\n");
                 }
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Tue Aug 12 08:47:12 2014 -0300
@@ -3618,8 +3618,8 @@
                     boolean leaf = model.isLeaf(node);
                     String label = getDisplayString(path, true, leaf);
 
-                    plainStr.append(label + "\n");
-                    htmlStr.append("  <li>" + label + "\n");
+                    plainStr.append(label).append('\n');
+                    htmlStr.append("  <li>").append(label).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
--- a/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Tue Aug 12 08:47:12 2014 -0300
@@ -1160,15 +1160,15 @@
             rows = rowMapper.getRowsForPaths(selection);
         else
             rows = null;
-        sb.append(getClass().getName() + " " + hashCode() + " [ ");
+        sb.append(getClass().getName()).append(' ').append(hashCode()).append(" [ ");
         for(int counter = 0; counter < selCount; counter++) {
             if(rows != null)
-                sb.append(selection[counter].toString() + "@" +
-                          Integer.toString(rows[counter])+ " ");
+                sb.append(selection[counter].toString()).append('@')
+                        .append(Integer.toString(rows[counter])).append(' ');
             else
-                sb.append(selection[counter].toString() + " ");
+                sb.append(selection[counter].toString()).append(' ');
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/font/AttributeValues.java
--- a/src/share/classes/sun/font/AttributeValues.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/AttributeValues.java	Tue Aug 12 08:47:12 2014 -0300
@@ -542,7 +542,7 @@
                 }
             }
         }
-        b.append("[btx=" + baselineTransform + ", ctx=" + charTransform + "]");
+        b.append("[btx=").append(baselineTransform).append(", ctx=").append(charTransform).append(']');
         b.append('}');
         return b.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/font/Decoration.java
--- a/src/share/classes/sun/font/Decoration.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/Decoration.java	Tue Aug 12 08:47:12 2014 -0300
@@ -431,12 +431,12 @@
             StringBuilder sb = new StringBuilder();
             sb.append(super.toString());
             sb.append("[");
-            if (fgPaint != null) sb.append("fgPaint: " + fgPaint);
-            if (bgPaint != null) sb.append(" bgPaint: " + bgPaint);
+            if (fgPaint != null) sb.append("fgPaint: ").append(fgPaint);
+            if (bgPaint != null) sb.append(" bgPaint: ").append(bgPaint);
             if (swapColors) sb.append(" swapColors: true");
             if (strikethrough) sb.append(" strikethrough: true");
-            if (stdUnderline != null) sb.append(" stdUnderline: " + stdUnderline);
-            if (imUnderline != null) sb.append(" imUnderline: " + imUnderline);
+            if (stdUnderline != null) sb.append(" stdUnderline: ").append(stdUnderline);
+            if (imUnderline != null) sb.append(" imUnderline: ").append(imUnderline);
             sb.append("]");
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/font/StandardGlyphVector.java
--- a/src/share/classes/sun/font/StandardGlyphVector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/StandardGlyphVector.java	Tue Aug 12 08:47:12 2014 -0300
@@ -1894,9 +1894,9 @@
             }
         }
         catch(Exception e) {
-            buf.append(" " + e.getMessage());
+            buf.append(' ').append(e.getMessage());
         }
-        buf.append("}");
+        buf.append('}');
 
         return buf;
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/launcher/LauncherHelper.java
--- a/src/share/classes/sun/launcher/LauncherHelper.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/launcher/LauncherHelper.java	Tue Aug 12 08:47:12 2014 -0300
@@ -369,10 +369,9 @@
     static void appendVmErgoMessage(boolean isServerClass, String vm) {
         outBuf = outBuf.append(getLocalizedMessage("java.launcher.ergo.message1",
                 vm));
-        outBuf = (isServerClass)
-             ? outBuf.append(",\n" +
-                getLocalizedMessage("java.launcher.ergo.message2") + "\n\n")
-             : outBuf.append(".\n\n");
+		outBuf = (isServerClass) ? outBuf.append(",\n")
+				.append(getLocalizedMessage("java.launcher.ergo.message2"))
+				.append("\n\n") : outBuf.append(".\n\n");
     }
 
     /**
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/management/Agent.java
--- a/src/share/classes/sun/management/Agent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/Agent.java	Tue Aug 12 08:47:12 2014 -0300
@@ -502,7 +502,7 @@
         } else {
             StringBuilder message = new StringBuilder(params[0]);
             for (int i = 1; i < params.length; i++) {
-                message.append(" " + params[i]);
+                message.append(' ').append(params[i]);
             }
             error(key, message.toString());
         }
diff -r dde9f5cfde5f src/share/classes/sun/management/MappedMXBeanType.java
--- a/src/share/classes/sun/management/MappedMXBeanType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/MappedMXBeanType.java	Tue Aug 12 08:47:12 2014 -0300
@@ -289,7 +289,7 @@
             if (et.isPrimitive()) {
                 className = new StringBuilder(c.getName());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
@@ -385,7 +385,7 @@
             if (elementType instanceof Class && ((Class) elementType).isPrimitive()) {
                 className = new StringBuilder(gat.toString());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
--- a/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Tue Aug 12 08:47:12 2014 -0300
@@ -463,12 +463,12 @@
 
     // ---------
 
-    private static void appendIfLiteralAddress(String addr, StringBuffer sb) {
+    private static void appendIfLiteralAddress(String addr, StringBuilder sb) {
         if (IPAddressUtil.isIPv4LiteralAddress(addr)) {
-            sb.append("dns://" + addr + " ");
+            sb.append("dns://").append(addr).append(' ');
         } else {
             if (IPAddressUtil.isIPv6LiteralAddress(addr)) {
-                sb.append("dns://[" + addr + "] ");
+                sb.append("dns://[").append(addr).append("] ");
             }
         }
     }
@@ -478,7 +478,7 @@
      *         corresponding to the supplied List of nameservers.
      */
     private static String createProviderURL(List<String> nsList) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (String s: nsList) {
             appendIfLiteralAddress(s, sb);
         }
@@ -491,7 +491,7 @@
      *         contained in the provided str.
      */
     private static String createProviderURL(String str) {
-        StringBuffer sb = new StringBuffer();
+    	StringBuilder sb = new StringBuilder();
         StringTokenizer st = new StringTokenizer(str, ",");
         while (st.hasMoreTokens()) {
             appendIfLiteralAddress(st.nextToken(), sb);
diff -r dde9f5cfde5f src/share/classes/sun/net/www/HeaderParser.java
--- a/src/share/classes/sun/net/www/HeaderParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/HeaderParser.java	Tue Aug 12 08:47:12 2014 -0300
@@ -220,21 +220,23 @@
 
     public String toString () {
         Iterator<String> k = keys();
-        StringBuffer sbuf = new StringBuffer();
-        sbuf.append ("{size="+asize+" nkeys="+nkeys+" ");
+        StringBuilder sb = new StringBuilder();
+		sb.append("{size=").append(asize).append(" nkeys=").append(nkeys)
+				.append(' ');
         for (int i=0; k.hasNext(); i++) {
             String key = k.next();
             String val = findValue (i);
             if (val != null && "".equals (val)) {
                 val = null;
             }
-            sbuf.append (" {"+key+(val==null?"":","+val)+"}");
+			sb.append(" {").append(key).append(val == null ? "" : "," + val)
+					.append('}');
             if (k.hasNext()) {
-                sbuf.append (",");
+                sb.append (',');
             }
         }
-        sbuf.append (" }");
-        return new String (sbuf);
+        sb.append (" }");
+        return new String (sb);
     }
 
     public int findInt(String k, int Default) {
diff -r dde9f5cfde5f src/share/classes/sun/net/www/MimeEntry.java
--- a/src/share/classes/sun/net/www/MimeEntry.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/MimeEntry.java	Tue Aug 12 08:47:12 2014 -0300
@@ -288,7 +288,7 @@
 
         int action = getAction();
         if (action != MimeEntry.UNKNOWN) {
-            sb.append("action=" + actionKeywords[action]);
+            sb.append("action=").append(actionKeywords[action]);
             needSeparator = true;
         }
 
@@ -297,7 +297,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("application=" + command);
+            sb.append("application=").append(command);
             needSeparator = true;
         }
 
@@ -305,7 +305,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("icon=" + getImageFileName());
+            sb.append("icon=").append(getImageFileName());
             needSeparator = true;
         }
 
@@ -314,7 +314,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("file_extensions=" + extensions);
+            sb.append("file_extensions=").append(extensions);
             needSeparator = true;
         }
 
@@ -323,7 +323,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("description=" + description);
+            sb.append("description=").append(description);
         }
 
         return sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/security/acl/AclEntryImpl.java
--- a/src/share/classes/sun/security/acl/AclEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/acl/AclEntryImpl.java	Tue Aug 12 08:47:12 2014 -0300
@@ -137,26 +137,30 @@
     /**
      * Return a string representation of  the contents of the ACL entry.
      */
-    public String toString() {
-        StringBuffer s = new StringBuffer();
-        if (negative)
-          s.append("-");
-        else
-          s.append("+");
-        if (user instanceof Group)
-            s.append("Group.");
-        else
-            s.append("User.");
-        s.append(user + "=");
-        Enumeration<Permission> e = permissions();
-        while(e.hasMoreElements()) {
-            Permission p = e.nextElement();
-            s.append(p);
-            if (e.hasMoreElements())
-                s.append(",");
-        }
-        return new String(s);
-    }
+	public String toString() {
+		StringBuffer sb = new StringBuffer();
+		if (negative) {
+			sb.append('-');
+		} else {
+			sb.append('+');
+		}
+		if (user instanceof Group) {
+			sb.append("Group.");
+		} else {
+			sb.append("User.");
+		}
+		sb.append(user).append('=');
+
+		Enumeration<Permission> e = permissions();
+		while (e.hasMoreElements()) {
+			Permission p = e.nextElement();
+			sb.append(p);
+			if (e.hasMoreElements()) {
+				sb.append(',');
+			}
+		}
+		return sb.toString();
+	}
 
     /**
      * Clones an AclEntry.
diff -r dde9f5cfde5f src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
--- a/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Tue Aug 12 08:47:12 2014 -0300
@@ -640,8 +640,7 @@
 
         for (int i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
--- a/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Tue Aug 12 08:47:12 2014 -0300
@@ -158,8 +158,8 @@
         }
         sb.append(hexDumper.encode(certHash));
         if (issuer != null && serialNumber != null) {
-            sb.append("\n\tIssuer: " + issuer + "\n");
-            sb.append("\t" + serialNumber);
+            sb.append("\n\tIssuer: ").append(issuer).append('\n');
+            sb.append('\t').append(serialNumber);
         }
         sb.append("\n]");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs11/P11KeyStore.java
--- a/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Tue Aug 12 08:47:12 2014 -0300
@@ -196,24 +196,24 @@
             } else if (type == ATTR_CLASS_CERT) {
                 sb.append("\ttype=[trusted cert]\n");
             }
-            sb.append("\tlabel=[" + label + "]\n");
+            sb.append("\tlabel=[").append(label).append("]\n");
             if (id == null) {
                 sb.append("\tid=[null]\n");
             } else {
-                sb.append("\tid=" + P11KeyStore.getID(id) + "\n");
+                sb.append("\tid=").append(P11KeyStore.getID(id)).append('\n');
             }
-            sb.append("\ttrusted=[" + trusted + "]\n");
-            sb.append("\tmatched=[" + matched + "]\n");
+            sb.append("\ttrusted=[").append(trusted).append("]\n");
+            sb.append("\tmatched=[").append(matched).append("]\n");
             if (cert == null) {
                 sb.append("\tcert=[null]\n");
             } else {
-                sb.append("\tcert=[\tsubject: " +
-                        cert.getSubjectX500Principal() +
-                        "\n\t\tissuer: " +
-                        cert.getIssuerX500Principal() +
-                        "\n\t\tserialNum: " +
-                        cert.getSerialNumber().toString() +
-                        "]");
+                sb.append("\tcert=[\tsubject: ")
+                        .append(cert.getSubjectX500Principal())
+                        .append("\n\t\tissuer: ")
+                        .append(cert.getIssuerX500Principal())
+                        .append("\n\t\tserialNum: ")
+                        .append(cert.getSerialNumber().toString())
+                        .append(']');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/PolicyFile.java
--- a/src/share/classes/sun/security/provider/PolicyFile.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/PolicyFile.java	Tue Aug 12 08:47:12 2014 -0300
@@ -1485,30 +1485,30 @@
         }
         int startIndex = 0;
         int v;
-        StringBuilder sb = new StringBuilder();
-        while ((v = sp.getSelfName().indexOf(SELF, startIndex)) != -1) {
+		StringBuilder sb = new StringBuilder();
+		while ((v = sp.getSelfName().indexOf(SELF, startIndex)) != -1) {
 
-            // add non-SELF string
-            sb.append(sp.getSelfName().substring(startIndex, v));
+			// add non-SELF string
+			sb.append(sp.getSelfName().substring(startIndex, v));
 
-            // expand SELF
-            Iterator<PolicyParser.PrincipalEntry> pli = entryPs.iterator();
-            while (pli.hasNext()) {
-                PolicyParser.PrincipalEntry pppe = pli.next();
-                String[][] principalInfo = getPrincipalInfo(pppe,pdp);
-                for (int i = 0; i < principalInfo.length; i++) {
-                    if (i != 0) {
-                        sb.append(", ");
-                    }
-                    sb.append(principalInfo[i][0] + " " +
-                        "\"" + principalInfo[i][1] + "\"");
-                }
-                if (pli.hasNext()) {
-                    sb.append(", ");
-                }
-            }
-            startIndex = v + SELF.length();
-        }
+			// expand SELF
+			Iterator<PolicyParser.PrincipalEntry> pli = entryPs.iterator();
+			while (pli.hasNext()) {
+				PolicyParser.PrincipalEntry pppe = pli.next();
+				String[][] principalInfo = getPrincipalInfo(pppe, pdp);
+				for (int i = 0; i < principalInfo.length; i++) {
+					if (i != 0) {
+						sb.append(", ");
+					}
+					sb.append(principalInfo[i][0]).append(' ').append('"')
+							.append(principalInfo[i][1]).append('"');
+				}
+				if (pli.hasNext()) {
+					sb.append(", ");
+				}
+			}
+			startIndex = v + SELF.length();
+		}
         // add remaining string (might be the entire string)
         sb.append(sp.getSelfName().substring(startIndex));
 
@@ -1774,17 +1774,17 @@
         Principal[] principals = pd.getPrincipals();
         String pals = "<no principals>";
         if (principals != null && principals.length > 0) {
-            StringBuilder palBuf = new StringBuilder("(principals ");
+            StringBuilder palSB = new StringBuilder("(principals ");
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                              " \"" + principals[i].getName() +
-                              "\"");
+                palSB.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append('"');
                 if (i < principals.length-1)
-                    palBuf.append(", ");
+                    palSB.append(", ");
                 else
-                    palBuf.append(")");
+                    palSB.append(')');
             }
-            pals = palBuf.toString();
+            pals = palSB.toString();
         }
         return "PD CodeSource: "
                 + pd.getCodeSource()
@@ -1884,7 +1884,7 @@
                     throw new Exception(form.format(source));
                 }
 
-                sb.append(X500PRINCIPAL + " \"" + suffix + "\"");
+                sb.append(X500PRINCIPAL).append(" \"").append(suffix).append('"');
                 startIndex = e+2;
             } else {
                 MessageFormat form = new MessageFormat
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/CertId.java
--- a/src/share/classes/sun/security/provider/certpath/CertId.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/CertId.java	Tue Aug 12 08:47:12 2014 -0300
@@ -223,13 +223,13 @@
     @Override public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CertId \n");
-        sb.append("Algorithm: " + hashAlgId.toString() +"\n");
+        sb.append("Algorithm: ").append(hashAlgId.toString()).append('\n');
         sb.append("issuerNameHash \n");
         HexDumpEncoder encoder = new HexDumpEncoder();
         sb.append(encoder.encode(issuerNameHash));
         sb.append("\nissuerKeyHash: \n");
         sb.append(encoder.encode(issuerKeyHash));
-        sb.append("\n" +  certSerialNumber.toString());
+        sb.append('\n').append(certSerialNumber.toString());
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/OCSPResponse.java
--- a/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Aug 12 08:47:12 2014 -0300
@@ -812,14 +812,14 @@
             StringBuilder sb = new StringBuilder();
             sb.append("SingleResponse:  \n");
             sb.append(certId);
-            sb.append("\nCertStatus: "+ certStatus + "\n");
+            sb.append("\nCertStatus: ").append(certStatus).append('\n');
             if (certStatus == CertStatus.REVOKED) {
-                sb.append("revocationTime is " + revocationTime + "\n");
-                sb.append("revocationReason is " + revocationReason + "\n");
+                sb.append("revocationTime is ").append(revocationTime).append('\n');
+                sb.append("revocationReason is ").append(revocationReason).append('\n');
             }
-            sb.append("thisUpdate is " + thisUpdate + "\n");
+            sb.append("thisUpdate is ").append(thisUpdate).append('\n');
             if (nextUpdate != null) {
-                sb.append("nextUpdate is " + nextUpdate + "\n");
+                sb.append("nextUpdate is ").append(nextUpdate).append('\n');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
--- a/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Tue Aug 12 08:47:12 2014 -0300
@@ -124,7 +124,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Build Forward Flag: " + String.valueOf(buildForward) + "\n");
+        sb.append("  Build Forward Flag: ").append(String.valueOf(buildForward)).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/HandshakeMessage.java
--- a/src/share/classes/sun/security/ssl/HandshakeMessage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/HandshakeMessage.java	Tue Aug 12 08:47:12 2014 -0300
@@ -1478,7 +1478,7 @@
                 boolean opened = false;
                 for (SignatureAndHashAlgorithm signAlg : algorithms) {
                     if (opened) {
-                        sb.append(", " + signAlg.getAlgorithmName());
+                        sb.append(", ").append(signAlg.getAlgorithmName());
                     } else {
                         sb.append(signAlg.getAlgorithmName());
                         opened = true;
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/ServerNameExtension.java
--- a/src/share/classes/sun/security/ssl/ServerNameExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/ServerNameExtension.java	Tue Aug 12 08:47:12 2014 -0300
@@ -267,11 +267,11 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
+        sb.append("Extension ").append(type).append(", server_name: ");
         for (SNIServerName sniName : sniMap.values()) {
-            sb.append("[" + sniName + "]");
+            sb.append('[').append(sniName).append(']');
         }
-
-        return "Extension " + type + ", server_name: " + sb;
+        return sb.toString();
     }
 
     private static class UnknownServerName extends SNIServerName {
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
--- a/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Tue Aug 12 08:47:12 2014 -0300
@@ -119,17 +119,17 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
+        sb.append("Extension ").append(type).append(", signature_algorithms: ");
         boolean opened = false;
         for (SignatureAndHashAlgorithm signAlg : algorithms) {
             if (opened) {
-                sb.append(", " + signAlg.getAlgorithmName());
+                sb.append(", ").append(signAlg.getAlgorithmName());
             } else {
                 sb.append(signAlg.getAlgorithmName());
                 opened = true;
             }
         }
-
-        return "Extension " + type + ", signature_algorithms: " + sb;
+        return  sb.toString();
     }
 }
 
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
--- a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Aug 12 08:47:12 2014 -0300
@@ -112,37 +112,37 @@
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Extension " + type + ", curve names: {");
-        boolean first = true;
-        for (int curveId : curveIds) {
-            if (first) {
-                first = false;
-            } else {
-                sb.append(", ");
-            }
-            // first check if it is a known named curve, then try other cases.
-            String oid = getCurveOid(curveId);
-            if (oid != null) {
-                ECParameterSpec spec = JsseJce.getECParameterSpec(oid);
-                // this toString() output will look nice for the current
-                // implementation of the ECParameterSpec class in the Sun
-                // provider, but may not look good for other implementations.
-                if (spec != null) {
-                    sb.append(spec.toString().split(" ")[0]);
-                } else {
-                    sb.append(oid);
-                }
-            } else if (curveId == ARBITRARY_PRIME) {
-                sb.append("arbitrary_explicit_prime_curves");
-            } else if (curveId == ARBITRARY_CHAR2) {
-                sb.append("arbitrary_explicit_char2_curves");
-            } else {
-                sb.append("unknown curve " + curveId);
-            }
-        }
-        sb.append("}");
-        return sb.toString();
+		StringBuilder sb = new StringBuilder();
+		sb.append("Extension ").append(type).append(", curve names: {");
+		boolean first = true;
+		for (int curveId : curveIds) {
+			if (first) {
+				first = false;
+			} else {
+				sb.append(", ");
+			}
+			// first check if it is a known named curve, then try other cases.
+			String oid = getCurveOid(curveId);
+			if (oid != null) {
+				ECParameterSpec spec = JsseJce.getECParameterSpec(oid);
+				// this toString() output will look nice for the current
+				// implementation of the ECParameterSpec class in the Sun
+				// provider, but may not look good for other implementations.
+				if (spec != null) {
+					sb.append(spec.toString().split(" ")[0]);
+				} else {
+					sb.append(oid);
+				}
+			} else if (curveId == ARBITRARY_PRIME) {
+				sb.append("arbitrary_explicit_prime_curves");
+			} else if (curveId == ARBITRARY_CHAR2) {
+				sb.append("arbitrary_explicit_char2_curves");
+			} else {
+				sb.append("unknown curve ").append(curveId);
+			}
+		}
+		sb.append("}");
+		return sb.toString();
     }
 
     // Test whether we support the curve with the given index.
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/jarsigner/Main.java
--- a/src/share/classes/sun/security/tools/jarsigner/Main.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/jarsigner/Main.java	Tue Aug 12 08:47:12 2014 -0300
@@ -676,14 +676,13 @@
                             ((man.getAttributes(name) != null) ||
                              (man.getAttributes("./"+name) != null) ||
                              (man.getAttributes("/"+name) != null));
-                        sb.append(
-                          (isSigned ? rb.getString("s") : rb.getString("SPACE")) +
-                          (inManifest ? rb.getString("m") : rb.getString("SPACE")) +
-                          (inStore ? rb.getString("k") : rb.getString("SPACE")) +
-                          (inScope ? rb.getString("i") : rb.getString("SPACE")) +
-                          ((inStoreOrScope & NOT_ALIAS) != 0 ?"X":" ") +
-                          rb.getString("SPACE"));
-                        sb.append("|");
+                        sb.append(isSigned ? rb.getString("s") : rb.getString("SPACE"))
+                                .append(inManifest ? rb.getString("m") : rb.getString("SPACE"))
+                                .append(inStore ? rb.getString("k") : rb.getString("SPACE"))
+                                .append(inScope ? rb.getString("i") : rb.getString("SPACE"))
+                                .append((inStoreOrScope & NOT_ALIAS) != 0 ? 'X' : ' ')
+                                .append(rb.getString("SPACE"));
+                        sb.append('|');
                     }
 
                     // When -certs provided, display info has extra empty
@@ -704,11 +703,13 @@
                         // Print no info for unsigned entries when -verbose:all,
                         // to be consistent with old behavior.
                         if (signatureRelated(name)) {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Signature.related.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(
+                            		rb.getString(".Signature.related.entries."))
+                            		.append("\n\n");
                         } else {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Unsigned.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(
+                            		rb.getString(".Unsigned.entries."))
+                            		.append("\n\n");
                         }
                     }
 
@@ -1605,8 +1606,8 @@
                 // No more warning, we alreay have hasExpiredCert or notYetValidCert
             } else {
                 chainNotValidated = true;
-                sb.append(tab + rb.getString(".CertPath.not.validated.") +
-                        e.getLocalizedMessage() + "]\n");   // TODO
+                sb.append(tab).append(rb.getString(".CertPath.not.validated."))
+                        .append(e.getLocalizedMessage()).append("]\n");   // TODO
             }
         }
         String result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/policytool/PolicyTool.java
--- a/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Tue Aug 12 08:47:12 2014 -0300
@@ -980,8 +980,9 @@
                                 grantEntry.principals.listIterator();
             while (list.hasNext()) {
                 PolicyParser.PrincipalEntry pppe = list.next();
-                sb.append(" Principal " + pppe.getDisplayClass() + " " +
-                    pppe.getDisplayName(true));
+                sb.append(" Principal ").append(pppe.getDisplayClass())
+                        .append(' ')
+                        .append(pppe.getDisplayName(true));
                 if (list.hasNext()) sb.append(", ");
             }
             result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/AVA.java
--- a/src/share/classes/sun/security/x509/AVA.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/AVA.java	Tue Aug 12 08:47:12 2014 -0300
@@ -1062,7 +1062,7 @@
             } else {
 
                 boolean quoteNeeded = false;
-                StringBuilder sbuffer = new StringBuilder();
+                StringBuilder sb = new StringBuilder();
                 boolean previousWhite = false;
                 final String escapees = ",+=\n<>#;\\\"";
 
@@ -1079,7 +1079,7 @@
                 for (int i = 0; i < length; i++) {
                     char c = valStr.charAt(i);
                     if (alreadyQuoted && (i == 0 || i == length - 1)) {
-                        sbuffer.append(c);
+                        sb.append(c);
                         continue;
                     }
                     if (DerValue.isPrintableStringChar(c) ||
@@ -1096,7 +1096,7 @@
                         if (!(c == ' ' || c == '\n')) {
                             // escape '"' and '\'
                             if (c == '"' || c == '\\') {
-                                sbuffer.append('\\');
+                                sb.append('\\');
                             }
                             previousWhite = false;
                         } else {
@@ -1106,7 +1106,7 @@
                             previousWhite = true;
                         }
 
-                        sbuffer.append(c);
+                        sb.append(c);
 
                     } else if (debug != null && Debug.isOn("ava")) {
 
@@ -1119,26 +1119,26 @@
                         byte[] valueBytes =
                                 Character.toString(c).getBytes("UTF8");
                         for (int j = 0; j < valueBytes.length; j++) {
-                            sbuffer.append('\\');
+                            sb.append('\\');
                             char hexChar = Character.forDigit
                                         (0xF & (valueBytes[j] >>> 4), 16);
-                            sbuffer.append(Character.toUpperCase(hexChar));
+                            sb.append(Character.toUpperCase(hexChar));
                             hexChar = Character.forDigit
                                         (0xF & (valueBytes[j]), 16);
-                            sbuffer.append(Character.toUpperCase(hexChar));
+                            sb.append(Character.toUpperCase(hexChar));
                         }
                     } else {
 
                         // append non-printable/non-escaped char
 
                         previousWhite = false;
-                        sbuffer.append(c);
+                        sb.append(c);
                     }
                 }
 
                 // quote if trailing whitespace
-                if (sbuffer.length() > 0) {
-                    char trailChar = sbuffer.charAt(sbuffer.length() - 1);
+                if (sb.length() > 0) {
+                    char trailChar = sb.charAt(sb.length() - 1);
                     if (trailChar == ' ' || trailChar == '\n') {
                         quoteNeeded = true;
                     }
@@ -1147,9 +1147,9 @@
                 // Emit the string ... quote it if needed
                 // if string is already quoted, don't re-quote
                 if (!alreadyQuoted && quoteNeeded) {
-                    retval.append("\"" + sbuffer.toString() + "\"");
+                    retval.append('"').append(sb.toString()).append('"');
                 } else {
-                    retval.append(sbuffer.toString());
+                    retval.append(sb.toString());
                 }
             }
         } catch (IOException e) {
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPoint.java
--- a/src/share/classes/sun/security/x509/DistributionPoint.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPoint.java	Tue Aug 12 08:47:12 2014 -0300
@@ -381,22 +381,22 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPoint:\n     " + fullName + "\n");
+            sb.append("DistributionPoint:\n     ").append(fullName).append('\n');
         }
         if (relativeName != null) {
-            sb.append("DistributionPoint:\n     " + relativeName + "\n");
+            sb.append("DistributionPoint:\n     ").append(relativeName).append('\n');
         }
 
         if (reasonFlags != null) {
             sb.append("   ReasonFlags:\n");
             for (int i = 0; i < reasonFlags.length; i++) {
                 if (reasonFlags[i]) {
-                    sb.append("    " + reasonToString(i) + "\n");
+                    sb.append("    ").append(reasonToString(i)).append('\n');
                 }
             }
         }
         if (crlIssuer != null) {
-            sb.append("   CRLIssuer:" + crlIssuer + "\n");
+            sb.append("   CRLIssuer:").append(crlIssuer).append('\n');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPointName.java
--- a/src/share/classes/sun/security/x509/DistributionPointName.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPointName.java	Tue Aug 12 08:47:12 2014 -0300
@@ -231,10 +231,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPointName:\n     " + fullName + "\n");
+            sb.append("DistributionPointName:\n     ").append(fullName).append('\n');
 
         } else {
-            sb.append("DistributionPointName:\n     " + relativeName + "\n");
+            sb.append("DistributionPointName:\n     ").append(relativeName).append('\n');
         }
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/PolicyInformation.java
--- a/src/share/classes/sun/security/x509/PolicyInformation.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/PolicyInformation.java	Tue Aug 12 08:47:12 2014 -0300
@@ -258,9 +258,9 @@
      * Return a printable representation of the PolicyInformation.
      */
     public String toString() {
-        StringBuilder s = new StringBuilder("  [" + policyIdentifier.toString());
-        s.append(policyQualifiers + "  ]\n");
-        return s.toString();
+        StringBuilder sb = new StringBuilder("  [" + policyIdentifier.toString());
+        sb.append(policyQualifiers).append("  ]\n");
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLEntryImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Tue Aug 12 08:47:12 2014 -0300
@@ -292,17 +292,17 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append(serialNumber.toString());
-        sb.append("  On: " + revocationDate.toString());
+        sb.append("  On: ").append(revocationDate.toString());
         if (certIssuer != null) {
-            sb.append("\n    Certificate issuer: " + certIssuer);
+            sb.append("\n    Certificate issuer: ").append(certIssuer);
         }
         if (extensions != null) {
             Collection<Extension> allEntryExts = extensions.getAllExtensions();
             Extension[] exts = allEntryExts.toArray(new Extension[0]);
 
-            sb.append("\n    CRL Entry Extensions: " + exts.length);
+            sb.append("\n    CRL Entry Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n    [" + (i+1) + "]: ");
+                sb.append("\n    [").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -313,9 +313,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLImpl.java	Tue Aug 12 08:47:12 2014 -0300
@@ -537,31 +537,32 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("X.509 CRL v" + (version+1) + "\n");
+        sb.append("X.509 CRL v").append(version + 1).append('\n');
         if (sigAlgId != null)
-            sb.append("Signature Algorithm: " + sigAlgId.toString() +
-                  ", OID=" + (sigAlgId.getOID()).toString() + "\n");
+            sb.append("Signature Algorithm: ").append(sigAlgId.toString())
+                    .append(", OID=")
+                    .append((sigAlgId.getOID()).toString()).append('\n');
         if (issuer != null)
-            sb.append("Issuer: " + issuer.toString() + "\n");
+            sb.append("Issuer: ").append(issuer.toString()).append('\n');
         if (thisUpdate != null)
-            sb.append("\nThis Update: " + thisUpdate.toString() + "\n");
+            sb.append("\nThis Update: ").append(thisUpdate.toString()).append('\n');
         if (nextUpdate != null)
-            sb.append("Next Update: " + nextUpdate.toString() + "\n");
+            sb.append("Next Update: ").append(nextUpdate.toString()).append('\n');
         if (revokedList.isEmpty())
             sb.append("\nNO certificates have been revoked\n");
         else {
-            sb.append("\nRevoked Certificates: " + revokedList.size());
+            sb.append("\nRevoked Certificates: ").append(revokedList.size());
             int i = 1;
             for (X509CRLEntry entry: revokedList) {
-                sb.append("\n[" + i++ + "] " + entry.toString());
+                sb.append("\n[").append(i++).append("] ").append(entry.toString());
             }
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Object[] objs = allExts.toArray();
-            sb.append("\nCRL Extensions: " + objs.length);
+            sb.append("\nCRL Extensions: ").append(objs.length);
             for (int i = 0; i < objs.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = (Extension)objs[i];
                 try {
                    if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -572,9 +573,8 @@
                            out.putOctetString(extValue);
                            extValue = out.toByteArray();
                            HexDumpEncoder enc = new HexDumpEncoder();
-                           sb.append("Extension unknown: "
-                                     + "DER encoded OCTET string =\n"
-                                     + enc.encodeBuffer(extValue) + "\n");
+                           sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                   .append(enc.encodeBuffer(extValue)).append('\n');
                       }
                    } else
                        sb.append(ext.toString()); // sub-class exists
@@ -585,8 +585,7 @@
         }
         if (signature != null) {
             HexDumpEncoder encoder = new HexDumpEncoder();
-            sb.append("\nSignature:\n" + encoder.encodeBuffer(signature)
-                      + "\n");
+            sb.append("\nSignature:\n").append(encoder.encodeBuffer(signature)).append('\n');
         } else
             sb.append("NOT signed yet\n");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertImpl.java
--- a/src/share/classes/sun/security/x509/X509CertImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertImpl.java	Tue Aug 12 08:47:12 2014 -0300
@@ -802,11 +802,11 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append(info.toString() + "\n");
-        sb.append("  Algorithm: [" + algId.toString() + "]\n");
+        sb.append(info.toString()).append('\n');
+        sb.append("  Algorithm: [").append(algId.toString()).append("]\n");
 
         HexDumpEncoder encoder = new HexDumpEncoder();
-        sb.append("  Signature:\n" + encoder.encodeBuffer(signature));
+        sb.append("  Signature:\n").append(encoder.encodeBuffer(signature));
         sb.append("\n]");
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertInfo.java
--- a/src/share/classes/sun/security/x509/X509CertInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertInfo.java	Tue Aug 12 08:47:12 2014 -0300
@@ -298,27 +298,27 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append("  " + version.toString() + "\n");
-        sb.append("  Subject: " + subject.toString() + "\n");
-        sb.append("  Signature Algorithm: " + algId.toString() + "\n");
-        sb.append("  Key:  " + pubKey.toString() + "\n");
-        sb.append("  " + interval.toString() + "\n");
-        sb.append("  Issuer: " + issuer.toString() + "\n");
-        sb.append("  " + serialNum.toString() + "\n");
+        sb.append("  ").append(version.toString()).append('\n');
+        sb.append("  Subject: ").append(subject.toString()).append('\n');
+        sb.append("  Signature Algorithm: ").append(algId.toString()).append('\n');
+        sb.append("  Key:  ").append(pubKey.toString()).append('\n');
+        sb.append("  ").append(interval.toString()).append('\n');
+        sb.append("  Issuer: ").append(issuer.toString()).append('\n');
+        sb.append("  ").append(serialNum.toString()).append('\n');
 
         // optional v2, v3 extras
         if (issuerUniqueId != null) {
-            sb.append("  Issuer Id:\n" + issuerUniqueId.toString() + "\n");
+            sb.append("  Issuer Id:\n").append(issuerUniqueId.toString()).append('\n');
         }
         if (subjectUniqueId != null) {
-            sb.append("  Subject Id:\n" + subjectUniqueId.toString() + "\n");
+            sb.append("  Subject Id:\n").append(subjectUniqueId.toString()).append('\n');
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Extension[] exts = allExts.toArray(new Extension[0]);
-            sb.append("\nCertificate Extensions: " + exts.length);
+            sb.append("\nCertificate Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -329,9 +329,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
@@ -341,10 +340,10 @@
             }
             Map<String,Extension> invalid = extensions.getUnparseableExtensions();
             if (invalid.isEmpty() == false) {
-                sb.append("\nUnparseable certificate extensions: " + invalid.size());
+                sb.append("\nUnparseable certificate extensions: ").append(invalid.size());
                 int i = 1;
                 for (Extension ext : invalid.values()) {
-                    sb.append("\n[" + (i++) + "]: ");
+                    sb.append("\n[").append(i++).append("]: ");
                     sb.append(ext);
                 }
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/ThreadTab.java
--- a/src/share/classes/sun/tools/jconsole/ThreadTab.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/ThreadTab.java	Tue Aug 12 08:47:12 2014 -0300
@@ -368,7 +368,7 @@
                             sb.append(Messages.STACK_TRACE);
                             int index = 0;
                             for (StackTraceElement e : ti.getStackTrace()) {
-                                sb.append(e.toString()+"\n");
+                                sb.append(e.toString()).append('\n');
                                 if (monitors != null) {
                                     for (MonitorInfo mi : monitors) {
                                         if (mi.getLockedStackDepth() == index) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Tue Aug 12 08:47:12 2014 -0300
@@ -79,25 +79,25 @@
             String textColor = String.format("%06x",
                                              foreground.getRGB() & 0xFFFFFF);
             StringBuilder sb = new StringBuilder();
-            sb.append("<html><body text=#"+textColor+"><table width=\"100%\">");
+            sb.append("<html><body text=#").append(textColor).append("><table width=\"100%\">");
             for (int i = 0; i < arr.length; i++) {
                 if (i % 2 == 0) {
-                    sb.append("<tr style=\"background-color: " +
-                            evenRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(evenRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 } else {
-                    sb.append("<tr style=\"background-color: " +
-                            oddRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(oddRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 }
             }
             if (arr.length == 0) {
-                sb.append("<tr style=\"background-color: " +
-                        evenRowColorStr + "\"><td></td></tr>");
+				sb.append("<tr style=\"background-color: ")
+						.append(evenRowColorStr).append("\"><td></td></tr>");
             }
             sb.append("</table></body></html>");
             arrayEditor.setText(sb.toString());
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XTree.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Tue Aug 12 08:47:12 2014 -0300
@@ -507,13 +507,13 @@
         // key order defined by the "orderedKeyPropertyList"
         for (String key : orderedKeyPropertyList) {
             if (map.containsKey(key)) {
-                sb.append(key + "=" + map.get(key) + ",");
+                sb.append(key).append('=').append(map.get(key)).append(',');
                 map.remove(key);
             }
         }
         // Add the remaining key/value pairs to the buffer
         for (Map.Entry<String, String> entry : map.entrySet()) {
-            sb.append(entry.getKey() + "=" + entry.getValue() + ",");
+            sb.append(entry.getKey()).append('=').append(entry.getValue()).append(',');
         }
         String orderedKeyPropertyListString = sb.toString();
         orderedKeyPropertyListString = orderedKeyPropertyListString.substring(
@@ -622,7 +622,7 @@
                     //
                     StringBuilder sb = new StringBuilder();
                     for (MBeanParameterInfo mbpi : mboi.getSignature()) {
-                        sb.append(mbpi.getType() + ",");
+                        sb.append(mbpi.getType()).append(',');
                     }
                     String signature = sb.toString();
                     if (signature.length() > 0) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jps/Jps.java
--- a/src/share/classes/sun/tools/jps/Jps.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jps/Jps.java	Tue Aug 12 08:47:12 2014 -0300
@@ -92,28 +92,28 @@
                     vm = monitoredHost.getMonitoredVm(id, 0);
 
                     errorString = " -- main class information unavailable";
-                    output.append(" " + MonitoredVmUtil.mainClass(vm,
+                    output.append(' ').append(MonitoredVmUtil.mainClass(vm,
                             arguments.showLongPaths()));
 
                     if (arguments.showMainArgs()) {
                         errorString = " -- main args information unavailable";
                         String mainArgs = MonitoredVmUtil.mainArgs(vm);
                         if (mainArgs != null && mainArgs.length() > 0) {
-                            output.append(" " + mainArgs);
+                            output.append(' ').append(mainArgs);
                         }
                     }
                     if (arguments.showVmArgs()) {
                         errorString = " -- jvm args information unavailable";
                         String jvmArgs = MonitoredVmUtil.jvmArgs(vm);
                         if (jvmArgs != null && jvmArgs.length() > 0) {
-                          output.append(" " + jvmArgs);
+                          output.append(' ').append(jvmArgs);
                         }
                     }
                     if (arguments.showVmFlags()) {
                         errorString = " -- jvm flags information unavailable";
                         String jvmFlags = MonitoredVmUtil.jvmFlags(vm);
                         if (jvmFlags != null && jvmFlags.length() > 0) {
-                            output.append(" " + jvmFlags);
+                            output.append(' ').append(jvmFlags);
                         }
                     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/RawOutputFormatter.java
--- a/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Tue Aug 12 08:47:12 2014 -0300
@@ -50,7 +50,7 @@
             StringBuilder headerBuilder = new StringBuilder();
             for (Iterator<Monitor> i = logged.iterator(); i.hasNext(); /* empty */ ) {
                 Monitor m = i.next();
-                headerBuilder.append(m.getName() + " ");
+                headerBuilder.append(m.getName()).append(' ');
             }
             header = headerBuilder.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/SyntaxException.java
--- a/src/share/classes/sun/tools/jstat/SyntaxException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/SyntaxException.java	Tue Aug 12 08:47:12 2014 -0300
@@ -65,7 +65,7 @@
     public SyntaxException(int lineno, Set<String> expected, Token found) {
         StringBuilder msg = new StringBuilder();
 
-        msg.append("Syntax error at line " + lineno + ": Expected one of \'");
+        msg.append("Syntax error at line ").append(lineno).append(": Expected one of \'");
 
         boolean first = true;
         for (Iterator<String> i = expected.iterator(); i.hasNext(); /* empty */) {
@@ -74,11 +74,11 @@
                 msg.append(keyWord);
                 first = false;
             } else {
-                msg.append("|" + keyWord);
+                msg.append('|').append(keyWord);
             }
         }
 
-        msg.append("\', Found " + found.toMessage());
+        msg.append("\', Found ").append(found.toMessage());
         message = msg.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/Token.java
--- a/src/share/classes/sun/tools/jstat/Token.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/Token.java	Tue Aug 12 08:47:12 2014 -0300
@@ -89,18 +89,18 @@
             sb.append("ttype=TT_EOF");
             break;
         case StreamTokenizer.TT_NUMBER:
-            sb.append("ttype=TT_NUM,").append("nval="+nval);
+            sb.append("ttype=TT_NUM,").append("nval=").append(nval);
             break;
         case StreamTokenizer.TT_WORD:
             if (sval == null) {
                 sb.append("ttype=TT_WORD:IDENTIFIER");
             } else {
-                sb.append("ttype=TT_WORD:").append("sval="+sval);
+                sb.append("ttype=TT_WORD:").append("sval=").append(sval);
             }
             break;
         default:
             if (ttype == (int)'"') {
-                sb.append("ttype=TT_STRING:").append("sval="+sval);
+                sb.append("ttype=TT_STRING:").append("sval=").append(sval);
             } else {
                 sb.append("ttype=TT_CHAR:").append((char)ttype);
             }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstatd/RemoteHostImpl.java
--- a/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Tue Aug 12 08:47:12 2014 -0300
@@ -68,7 +68,7 @@
 
         sb.append("local://").append(lvmid).append("@localhost");
         if (mode != null) {
-            sb.append("?mode=" + mode);
+            sb.append("?mode=").append(mode);
         }
 
         String vmidStr = sb.toString();

From alexander.potochkin at oracle.com  Tue Aug 12 12:59:19 2014
From: alexander.potochkin at oracle.com (Alexander Potochkin)
Date: Tue, 12 Aug 2014 16:59:19 +0400
Subject: <Swing Dev> Review request for 8042835: unexpected mnemonic in
 JFileChooser
In-Reply-To: <53E8732F.4050502@oracle.com>
References: <53E219D3.3070402@oracle.com>
	<53E38762.5080409@oracle.com>	<53E38B53.4030401@oracle.com>
	<53E8732F.4050502@oracle.com>
Message-ID: <53EA0FA7.2070702@oracle.com>

Looks good!

Thanks
alexp

On 8/11/2014 11:39 AM, artem malinko wrote:
> Hello again. Could somebody else join to the review please?
>
> On 8/7/2014 6:21 PM, artem malinko wrote:
>> Thank you, Alexandr.
>>
>> > The link to the webrev points to the 8047288 fix instead of 8042835
>> Sorry, some weird copy and paste.
>>
>> Here is the good link for the next reviewer:
>> http://cr.openjdk.java.net/~dmarkov/8042835/webrev.00/
>>
>> On 8/7/2014 6:04 PM, Alexander Scherbatiy wrote:
>>>
>>>  The fix looks good to me.
>>>
>>>  The link to the webrev points to the 8047288 fix instead of 8042835.
>>>
>>>  Thanks,
>>>  Alexandr.
>>>
>>> On 8/6/2014 4:04 PM, artem malinko wrote:
>>>> Hello, Swing team.
>>>>
>>>> Please review a fix for the issue:
>>>> https://bugs.openjdk.java.net/browse/JDK-8042835
>>>> The fix is available at:
>>>> http://cr.openjdk.java.net/~dmarkov/8042835/webrev.00/ 
>>>> <http://cr.openjdk.java.net/%7Emcherkas/artem/8047288/webrev.01/>
>>>>
>>>> Bug relates to:
>>>> https://bugs.openjdk.java.net/browse/JDK-5081721
>>>> https://bugs.openjdk.java.net/browse/JDK-7174970
>>>> Back then not all properties were fixed. This fix simply finishes 
>>>> started work.
>>>>
>>>> Thank you. 
>>>
>>
>



From artem.malinko at oracle.com  Tue Aug 12 12:57:50 2014
From: artem.malinko at oracle.com (artem malinko)
Date: Tue, 12 Aug 2014 16:57:50 +0400
Subject: <Swing Dev> Review request for 8042835: unexpected mnemonic in
 JFileChooser
In-Reply-To: <53EA0FA7.2070702@oracle.com>
References: <53E219D3.3070402@oracle.com>
	<53E38762.5080409@oracle.com>	<53E38B53.4030401@oracle.com>
	<53E8732F.4050502@oracle.com> <53EA0FA7.2070702@oracle.com>
Message-ID: <53EA0F4E.6010204@oracle.com>

Thank you, Alex.

On 8/12/2014 4:59 PM, Alexander Potochkin wrote:
> Looks good!
>
> Thanks
> alexp
>
> On 8/11/2014 11:39 AM, artem malinko wrote:
>> Hello again. Could somebody else join to the review please?
>>
>> On 8/7/2014 6:21 PM, artem malinko wrote:
>>> Thank you, Alexandr.
>>>
>>> > The link to the webrev points to the 8047288 fix instead of 8042835
>>> Sorry, some weird copy and paste.
>>>
>>> Here is the good link for the next reviewer:
>>> http://cr.openjdk.java.net/~dmarkov/8042835/webrev.00/
>>>
>>> On 8/7/2014 6:04 PM, Alexander Scherbatiy wrote:
>>>>
>>>>  The fix looks good to me.
>>>>
>>>>  The link to the webrev points to the 8047288 fix instead of 8042835.
>>>>
>>>>  Thanks,
>>>>  Alexandr.
>>>>
>>>> On 8/6/2014 4:04 PM, artem malinko wrote:
>>>>> Hello, Swing team.
>>>>>
>>>>> Please review a fix for the issue:
>>>>> https://bugs.openjdk.java.net/browse/JDK-8042835
>>>>> The fix is available at:
>>>>> http://cr.openjdk.java.net/~dmarkov/8042835/webrev.00/ 
>>>>> <http://cr.openjdk.java.net/%7Emcherkas/artem/8047288/webrev.01/>
>>>>>
>>>>> Bug relates to:
>>>>> https://bugs.openjdk.java.net/browse/JDK-5081721
>>>>> https://bugs.openjdk.java.net/browse/JDK-7174970
>>>>> Back then not all properties were fixed. This fix simply finishes 
>>>>> started work.
>>>>>
>>>>> Thank you. 
>>>>
>>>
>>
>



From joe.darcy at oracle.com  Tue Aug 12 22:51:20 2014
From: joe.darcy at oracle.com (Joe Darcy)
Date: Tue, 12 Aug 2014 15:51:20 -0700
Subject: <Swing Dev> JDK 9 RFR of JDK-8054360: Refine generification of
	javax.swing
In-Reply-To: <53E43407.8090104@oracle.com>
References: <53E43407.8090104@oracle.com>
Message-ID: <53EA9A68.7060404@oracle.com>

*ping*

Any other comments here?

Thanks,

-Joe

On 08/07/2014 07:20 PM, Joe Darcy wrote:
> Hello,
>
> Please review my changes for
>
>     JDK-8054360: Refine generification of javax.swing h
> http://cr.openjdk.java.net/~darcy/8054360.3/
>
> Full patch below.
>
> This resolves many of the source incompatibility exemplars Jan Lahoda 
> found in a corpus of programs using swing.
>
> A few comments on the changes.
>
> It seems many existing implementations of the TreeNode interface have 
> a covariant override of the old raw
>
>     Enumeration children();
>
> method which returns an enumeration of the specific TreeNode 
> implementation type. The revised generification of
>
>     Enumeration<? extends TreeNode> children();
>
> allows those existing implementations to still compile. This is a 
> lower-impact way of allowing those types to still compile compared to 
> trying to add a type variable to TreeNode.
>
> After some expert generics advice from Dan Smith, I but together a 
> different generification of
>
>     src/share/classes/javax/swing/table/DefaultTableModel.java
>
> which has better source compatibility. Quoting from the changes:
>
>   73     @SuppressWarnings("rawtypes")
>   74     protected Vector<Vector>    dataVector;
>   75
>   76     /** The <code>Vector</code> of column identifiers. */
>   77     @SuppressWarnings("rawtypes")
>   78     protected Vector    columnIdentifiers;
>   79     // Unfortunately, for greater source compatibility the 
> inner-most
>   80     // Vector in the two fields above is being left raw. The 
> Vector is
>   81     // read as well as written so using Vector<?> is not suitable 
> and
>   82     // using Vector<Object> (without adding copying of input 
> Vectors),
>   83     // would disallow existing code that used, say, a Vector<String>
>   84     // as an input parameter.
>
> The setter methods used for these fields are changes to have 
> parameters of type Vector<?> and Vector<? extends Vector>, respectively.
>
> The type Vector<? extends Vector> is the most general type which 
> captures the implicit constraint of the dataVector field: it is a 
> Vector of other Vectors. (It would probably be possible to update 
> dataVector to the somewhat more general Vector<List>, but that would 
> require changes to the code in other methods of the class.)
>
> The changes in 
> src/share/classes/sun/tools/jconsole/inspector/TableSorter.java change 
> the code back to how it was before the swing generification changes 
> went in based on the changes to DefaultTableModel.
>
> Once the exact generification is settled, I'll file the internal ccc 
> paperwork.
>
> Early feedback on using this revised generification on swing code is 
> welcome!
>
> Thanks,
>
> -Joe
>



From otaviojava at java.net  Tue Aug 12 23:01:07 2014
From: otaviojava at java.net (=?UTF-8?Q?Ot=C3=A1vio_Gon=C3=A7alves_de_Santana?=)
Date: Tue, 12 Aug 2014 20:01:07 -0300
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <53EA137C.5020701@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
Message-ID: <CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>

Thank you Roger.
Done
https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_6.zip


On Tue, Aug 12, 2014 at 10:15 AM, roger riggs <roger.riggs at oracle.com>
wrote:

> fyi,
>
> There's a Perl script normalizer.pl that detects/fixes most of the simple
> tab/white space issues.
> The script is in the <repo>/make/scripts/normalizer.pl
>
> Roger
>
>
> On 8/12/2014 3:48 AM, Andrej Golovnin wrote:
>
>> Hi Ot?vio,
>>
>> I think you should fix the indentation in a lot of classes. You use the
>> tab-character for the indentation. As far as I know we should use the
>> space
>> character for the indentation in the JDK sources (Oracle devs feel free to
>> correct me if I'm wrong. And it would be really nice if the style guide
>> for
>> the source code would be a part of the JDK repository. So we don't need to
>> search for it on the internet/wiki. Just clone the repository, read the
>> style guide and follow it. :-) ). Here is the not complete list of classes
>> where you used the tab-character for the indentation:
>>
>> src/share/classes/com/sun/crypto/provider/OAEPParameters.java
>> src/share/classes/java/lang/management/MemoryUsage.java
>> src/share/classes/java/security/KeyStore.java
>> src/share/classes/java/security/PermissionCollection.java
>> src/share/classes/java/security/ProtectionDomain.java
>> src/share/classes/java/security/cert/CertPath.java
>> src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
>> src/share/classes/java/security/cert/PKIXParameters.java
>> src/share/classes/java/security/cert/PolicyQualifierInfo.java
>> src/share/classes/java/security/cert/TrustAnchor.java
>> src/share/classes/java/security/cert/X509CertSelector.java
>> src/share/classes/javax/crypto/CryptoPermission.java
>> src/share/classes/javax/management/relation/Role.java
>>
>>
>> In src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj in the line 423 a
>> dot
>> is missed before append:
>>
>> 423   {jjtn000.name.append( '.')append(t.image); }
>>
>> Best regards,
>> Andrej Golovnin
>>
>
>


-- 
Ot?vio Gon?alves de Santana

blog:     http://otaviosantana.blogspot.com.br/
twitter: http://twitter.com/otaviojava
site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
55 (11) 98255-3513
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140812/8fe89f16/attachment.html>
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/com/sun/awt/AWTUtilities.java
--- a/src/share/classes/com/sun/awt/AWTUtilities.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/awt/AWTUtilities.java	Tue Aug 12 19:52:29 2014 -0300
@@ -459,4 +459,3 @@
                 shape);
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/awt/SecurityWarning.java
--- a/src/share/classes/com/sun/awt/SecurityWarning.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/awt/SecurityWarning.java	Tue Aug 12 19:52:29 2014 -0300
@@ -166,4 +166,3 @@
                 point, alignmentX, alignmentY);
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/AESCipher.java
--- a/src/share/classes/com/sun/crypto/provider/AESCipher.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/AESCipher.java	Tue Aug 12 19:52:29 2014 -0300
@@ -622,4 +622,3 @@
         }
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHParameters.java
--- a/src/share/classes/com/sun/crypto/provider/DHParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHParameters.java	Tue Aug 12 19:52:29 2014 -0300
@@ -137,8 +137,11 @@
                                + Debug.toHexString(this.p)
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
-        if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+        if (this.l != 0) {
+            sb.append(LINE_SEP).append("l:")
+            .append(LINE_SEP).append("    ")
+            .append(this.l);
+        }
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHPublicKey.java
--- a/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Tue Aug 12 19:52:29 2014 -0300
@@ -268,8 +268,10 @@
                                + Debug.toHexString(this.p)
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
-        if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+        if (this.l != 0) {
+            sb.append(LINE_SEP).append("l:").append(LINE_SEP)
+            .append("    ").append(this.l);
+        }
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/GCMParameters.java
--- a/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Tue Aug 12 19:52:29 2014 -0300
@@ -140,7 +140,8 @@
             = new StringBuilder(LINE_SEP + "    iv:" + LINE_SEP + "["
                 + encoder.encodeBuffer(iv) + "]");
 
-        sb.append(LINE_SEP + "tLen(bits):" + LINE_SEP + tLen*8 + LINE_SEP);
+        sb.append(LINE_SEP).append("tLen(bits):").append(LINE_SEP)
+        .append(tLen * 8).append(LINE_SEP);
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/OAEPParameters.java
--- a/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Tue Aug 12 19:52:29 2014 -0300
@@ -239,10 +239,12 @@
 
     protected String engineToString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("MD: " + mdName + "\n");
-        sb.append("MGF: MGF1" + mgfSpec.getDigestAlgorithm() + "\n");
-        sb.append("PSource: PSpecified " +
-            (p.length==0? "":Debug.toHexString(new BigInteger(p))) + "\n");
+        sb.append("MD: ").append(mdName).append('\n');
+        sb.append("MGF: MGF1").append(mgfSpec.getDigestAlgorithm())
+                .append('\n');
+        sb.append("PSource: PSpecified ")
+                .append(p.length == 0 ? "" : Debug
+                        .toHexString(new BigInteger(p))).append('\n');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/RC2Parameters.java
--- a/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Tue Aug 12 19:52:29 2014 -0300
@@ -221,8 +221,9 @@
                 + encoder.encodeBuffer(iv) + "]");
 
         if (version != 0) {
-            sb.append(LINE_SEP + "version:" + LINE_SEP
-                + version + LINE_SEP);
+            sb.append(LINE_SEP).append("version:")
+                    .append(LINE_SEP).append(version)
+                    .append(LINE_SEP);
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/java/util/jar/pack/FixedList.java
--- a/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	Tue Aug 12 19:52:29 2014 -0300
@@ -171,4 +171,3 @@
         return "FixedList{" + "plist=" + flist + '}';
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java
--- a/src/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java	Tue Aug 12 19:52:29 2014 -0300
@@ -127,4 +127,3 @@
     public ClassLoaderRepository getClassLoaderRepository();
 
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Tue Aug 12 19:52:29 2014 -0300
@@ -65,7 +65,7 @@
                 "extractSubNet", "BINARY ARRAY :");
             StringBuilder sb = new StringBuilder();
             for(int i =0; i < addrLength; i++) {
-                sb.append((b[i] & 0xFF) + ":");
+                sb.append(b[i] & 0xFF).append(':');
             }
             SNMP_LOGGER.logp(Level.FINEST, NetMaskImpl.class.getName(),
                 "extractSubNet", sb.toString());
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Tue Aug 12 19:52:29 2014 -0300
@@ -204,7 +204,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Tue Aug 12 19:52:29 2014 -0300
@@ -379,7 +379,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(IDENTIFIER);
-   jjtn000.name.append( "." + t.image);
+   jjtn000.name.append('.').append(t.image);
       }
     } finally {
     if (jjtc000) {
@@ -408,7 +408,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -454,7 +454,7 @@
         }
         jj_consume_token(MARK);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -483,7 +483,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
       jj_consume_token(MASK);
       t = jj_consume_token(INTEGER_LITERAL);
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj	Tue Aug 12 19:52:29 2014 -0300
@@ -420,7 +420,7 @@
   t=<IDENTIFIER> { jjtn000.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtn000.name.append( "." + t.image); }
+  {jjtn000.name.append( '.').append(t.image); }
 )*/*@bgen(jjtree)*/
   } finally {
     if (jjtc000) {
@@ -447,7 +447,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -501,7 +501,7 @@
   {jjtn000.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -527,7 +527,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL>/*@bgen(jjtree)*/
                             {
                               jjtree.closeNodeScope(jjtn000, true);
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt	Tue Aug 12 19:52:29 2014 -0300
@@ -213,7 +213,7 @@
   t=<IDENTIFIER> { jjtThis.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtThis.name.append( "." + t.image); }
+  {jjtThis.name.append( '.').append(t.image); }
 )*
 
 }
@@ -228,7 +228,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )*
 
 }
@@ -253,7 +253,7 @@
   {jjtThis.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )*
 }
 
@@ -267,7 +267,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL> {jjtThis.mask = t.image; }
 }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Tue Aug 12 19:52:29 2014 -0300
@@ -99,7 +99,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java
--- a/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Tue Aug 12 19:52:29 2014 -0300
@@ -479,10 +479,10 @@
      */
     public String printMessage() {
         StringBuilder sb = new StringBuilder();
-        sb.append("msgId : " + msgId + "\n");
-        sb.append("msgMaxSize : " + msgMaxSize + "\n");
-        sb.append("msgFlags : " + msgFlags + "\n");
-        sb.append("msgSecurityModel : " + msgSecurityModel + "\n");
+        sb.append("msgId : ").append(msgId).append('\n');
+        sb.append("msgMaxSize : ").append(msgMaxSize).append('\n');
+        sb.append("msgFlags : ").append(msgFlags).append('\n');
+        sb.append("msgSecurityModel : ").append(msgSecurityModel).append('\n');
 
         if (contextEngineId == null) {
             sb.append("contextEngineId : null");
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
--- a/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Tue Aug 12 19:52:29 2014 -0300
@@ -256,7 +256,7 @@
     private static String stringifyComponent(NameComponent comp) {
         StringBuilder one = new StringBuilder(escape(comp.id));
         if (comp.kind != null && !comp.kind.equals("")) {
-            one.append(kindSeparator + escape(comp.kind));
+            one.append(kindSeparator).append(escape(comp.kind));
         }
         if (one.length() == 0) {
             return ""+kindSeparator;  // if neither id nor kind specified
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java
--- a/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Tue Aug 12 19:52:29 2014 -0300
@@ -90,7 +90,7 @@
                         if (selected == -1) {
                             StringBuilder allChoices = new StringBuilder();
                             for (int j = 0; j <  choices.length; j++) {
-                                allChoices.append(choices[j] + ",");
+                                allChoices.append(choices[j]).append(',');
                             }
                             throw new IOException("Cannot match " +
                                 "'java.naming.security.sasl.realm' property value, '" +
diff -r dde9f5cfde5f src/share/classes/com/sun/media/sound/SoftReverb.java
--- a/src/share/classes/com/sun/media/sound/SoftReverb.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/media/sound/SoftReverb.java	Tue Aug 12 19:52:29 2014 -0300
@@ -512,4 +512,3 @@
         this.light = light;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
--- a/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Tue Aug 12 19:52:29 2014 -0300
@@ -167,9 +167,9 @@
         for (int i = 0; i < allchannelnames.length; i++) {
             if ((channelmask & m) != 0L) {
                 if (i < channelnames.length) {
-                    sb.append(channelnames[i] + " ");
+                    sb.append(channelnames[i]).append(' ');
                 } else {
-                    sb.append(allchannelnames[i] + " ");
+                    sb.append(allchannelnames[i]).append(' ');
                 }
             }
             m *= 2L;
diff -r dde9f5cfde5f src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
--- a/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java	Tue Aug 12 19:52:29 2014 -0300
@@ -104,4 +104,3 @@
      */
     public abstract boolean checkCredentials (String username, String password);
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java
--- a/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java	Tue Aug 12 19:52:29 2014 -0300
@@ -50,4 +50,3 @@
         super(msg);
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java
--- a/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java	Tue Aug 12 19:52:29 2014 -0300
@@ -50,4 +50,3 @@
         super(msg);
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/nio/sctp/InvalidStreamException.java
--- a/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java	Tue Aug 12 19:52:29 2014 -0300
@@ -49,4 +49,3 @@
         super(msg);
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/Init.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java	Tue Aug 12 19:52:29 2014 -0300
@@ -365,4 +365,3 @@
     }
 
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Tue Aug 12 19:52:29 2014 -0300
@@ -235,14 +235,15 @@
                     String nodeName = att.getNodeName();
                     if ((nodeName.equals("xmlns") || nodeName.startsWith("xmlns:"))
                         && !storedNamespaces.containsKey(att.getNodeName())) {
-                        sb.append(" " + nodeName + "=\"" + att.getNodeValue() + "\"");
+                        sb.append(' ').append(nodeName).append("=\"")
+                        .append(att.getNodeValue()).append('"');
                         storedNamespaces.put(nodeName, att.getNodeValue());
                     }
                 }
             }
             wk = wk.getParentNode();
         }
-        sb.append(">" + source + "</dummy>");
+        sb.append('>').append(source).append("</dummy>");
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java	Tue Aug 12 19:52:29 2014 -0300
@@ -92,4 +92,3 @@
      */
     void setCipherReference(CipherReference reference) throws XMLEncryptionException;
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java	Tue Aug 12 19:52:29 2014 -0300
@@ -92,4 +92,3 @@
      */
     void setTransforms(Transforms transforms);
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java	Tue Aug 12 19:52:29 2014 -0300
@@ -43,4 +43,3 @@
  */
 public interface EncryptedData extends EncryptedType {
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java	Tue Aug 12 19:52:29 2014 -0300
@@ -110,4 +110,3 @@
      */
     void setCarriedName(String name);
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java	Tue Aug 12 19:52:29 2014 -0300
@@ -194,4 +194,3 @@
      */
     void setEncryptionProperties(EncryptionProperties properties);
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java	Tue Aug 12 19:52:29 2014 -0300
@@ -130,4 +130,3 @@
      */
     void removeEncryptionMethodInformation(Element information);
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java	Tue Aug 12 19:52:29 2014 -0300
@@ -84,4 +84,3 @@
      */
     void removeEncryptionProperty(EncryptionProperty property);
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java	Tue Aug 12 19:52:29 2014 -0300
@@ -24,4 +24,4 @@
 package com.sun.org.apache.xml.internal.security.transforms;
 
 public interface TransformParam {
-}
\ No newline at end of file
+}
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Tue Aug 12 19:52:29 2014 -0300
@@ -85,7 +85,7 @@
             if (prefix.equals("xmlns")) {
                 sb.append("#default ");
             } else {
-                sb.append(prefix + " ");
+                sb.append(prefix).append(' ');
             }
         }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Tue Aug 12 19:52:29 2014 -0300
@@ -88,7 +88,7 @@
                 l += countQuotes(DN, j, k);
 
                 if ((k > 0) && (DN.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml) + ",");
+                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml)).append(',');
 
                     i = k + 1;
                     l = 0;
@@ -121,7 +121,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(parseATAV(trim(str.substring(i, k)), toXml) + "+");
+                sb.append(parseATAV(trim(str.substring(i, k)), toXml)).append('+');
 
                 i = k + 1;
                 l = 0;
@@ -369,7 +369,7 @@
         int k;
 
         for (int j = 0; (k = string.indexOf("\\20", j)) >= 0; j = k + 3) {
-            sb.append(trim(string.substring(i, k)) + "\\ ");
+            sb.append(trim(string.substring(i, k))).append("\\ ");
 
             i = k + 3;
         }
@@ -418,7 +418,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(trim(str.substring(i, k)) + replace);
+                sb.append(trim(str.substring(i, k))).append(replace);
 
                 i = k + 1;
                 l = 0;
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/CramMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Tue Aug 12 19:52:29 2014 -0300
@@ -196,8 +196,7 @@
 
         for (i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Tue Aug 12 19:52:29 2014 -0300
@@ -391,8 +391,7 @@
 
         for (int i = 0; i < digest.length; i ++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0"+
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/ParseException.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Tue Aug 12 19:52:29 2014 -0300
@@ -198,7 +198,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Tue Aug 12 19:52:29 2014 -0300
@@ -107,7 +107,7 @@
         default:
           if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
             String s = "0000" + Integer.toString(ch, 16);
-            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+            retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
           } else {
             retval.append(ch);
           }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
--- a/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Tue Aug 12 19:52:29 2014 -0300
@@ -338,10 +338,10 @@
             if (classpath.isEmpty()) {
                 String envcp = System.getProperty("env.class.path");
                 if ((envcp != null) && (envcp.length() > 0)) {
-                    munged.append(" -classpath " + envcp);
+                    munged.append(" -classpath ").append(envcp);
                 }
             } else {
-                munged.append(" -classpath " + classpath.asString());
+                munged.append(" -classpath ").append(classpath.asString());
             }
             return munged.toString();
         } else {
@@ -349,14 +349,4 @@
         }
     }
 
-    private String appendPath(String path1, String path2) {
-        if (path1 == null || path1.length() == 0) {
-            return path2 == null ? "." : path2;
-        } else if (path2 == null || path2.length() == 0) {
-            return path1;
-        } else {
-            return path1  + File.pathSeparator + path2;
-        }
-    }
-
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/extcheck/Main.java
--- a/src/share/classes/com/sun/tools/extcheck/Main.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/extcheck/Main.java	Tue Aug 12 19:52:29 2014 -0300
@@ -87,4 +87,3 @@
         throw new Exception(msg + "\nUsage: extcheck [-verbose] <jar file>");
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Tue Aug 12 19:52:29 2014 -0300
@@ -346,12 +346,12 @@
 
     public String valueString(boolean bigLimit) {
         // Char arrays deserve special treatment
-        StringBuffer result;
+        StringBuilder result;
         byte[] value = getValue();
         int max = value.length;
         byte elementSignature = getElementType();
         if (elementSignature == 'C')  {
-            result = new StringBuffer();
+            result = new StringBuilder();
             for (int i = 0; i < value.length; ) {
                 char val = charAt(i, value);
                 result.append(val);
@@ -362,7 +362,7 @@
             if (bigLimit) {
                 limit = 1000;
             }
-            result = new StringBuffer("{");
+            result = new StringBuilder("{");
             int num = 0;
             for (int i = 0; i < value.length; ) {
                 if (num > 0) {
@@ -386,37 +386,37 @@
                     }
                     case 'B': {
                         int val = 0xFF & byteAt(i, value);
-                        result.append("0x" + Integer.toString(val, 16));
+                        result.append("0x").append(Integer.toString(val, 16));
                         i++;
                         break;
                     }
                     case 'S': {
                         short val = shortAt(i, value);
                         i += 2;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'I': {
                         int val = intAt(i, value);
                         i += 4;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'J': {         // long
                         long val = longAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
                     case 'F': {
                         float val = floatAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 4;
                         break;
                     }
                     case 'D': {         // double
                         double val = doubleAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
@@ -425,7 +425,7 @@
                     }
                 }
             }
-            result.append("}");
+            result.append('}');
         }
         return result.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/util/Misc.java
--- a/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Tue Aug 12 19:52:29 2014 -0300
@@ -97,11 +97,11 @@
             } else if (ch == '&') {
                 sb.append("&amp;");
             } else if (ch < ' ') {
-                sb.append("&#" + Integer.toString(ch) + ";");
+                sb.append("&#").append(Integer.toString(ch)).append(';');
             } else {
                 int c = (ch & 0xFFFF);
                 if (c > 127) {
-                    sb.append("&#" + Integer.toString(c) + ";");
+                    sb.append("&#").append(Integer.toString(c)).append(';');
                 } else {
                     sb.append(ch);
                 }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java
--- a/src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java	Tue Aug 12 19:52:29 2014 -0300
@@ -140,4 +140,4 @@
         // method must be directly in this interface
         return this.equals(method.declaringType());
     }
-}
\ No newline at end of file
+}
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
--- a/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Tue Aug 12 19:52:29 2014 -0300
@@ -881,12 +881,12 @@
             } else if (tag == JDWP.TypeTag.ARRAY) {
                 sb.append("ArrayType");
             } else {
-                sb.append("UNKNOWN TAG: " + tag);
+                sb.append("UNKNOWN TAG: ").append(tag);
             }
             if (signature != null) {
-                sb.append(", signature='" + signature + "'");
+                sb.append(", signature='").append(signature).append('\'');
             }
-            sb.append(", id=" + id);
+            sb.append(", id=").append(id);
             vm.printTrace(sb.toString());
         }
         if (id == 0) {
diff -r dde9f5cfde5f src/share/classes/com/sun/tracing/ProbeName.java
--- a/src/share/classes/com/sun/tracing/ProbeName.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tracing/ProbeName.java	Tue Aug 12 19:52:29 2014 -0300
@@ -45,4 +45,3 @@
 public @interface ProbeName {
     String value();
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/tracing/ProviderFactory.java
--- a/src/share/classes/com/sun/tracing/ProviderFactory.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tracing/ProviderFactory.java	Tue Aug 12 19:52:29 2014 -0300
@@ -111,4 +111,3 @@
         }
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/tracing/ProviderName.java
--- a/src/share/classes/com/sun/tracing/ProviderName.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tracing/ProviderName.java	Tue Aug 12 19:52:29 2014 -0300
@@ -45,4 +45,3 @@
 public @interface ProviderName {
     String value();
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/tracing/dtrace/DependencyClass.java
--- a/src/share/classes/com/sun/tracing/dtrace/DependencyClass.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tracing/dtrace/DependencyClass.java	Tue Aug 12 19:52:29 2014 -0300
@@ -74,4 +74,3 @@
         this.encoding = encoding;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/tracing/dtrace/FunctionName.java
--- a/src/share/classes/com/sun/tracing/dtrace/FunctionName.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tracing/dtrace/FunctionName.java	Tue Aug 12 19:52:29 2014 -0300
@@ -44,4 +44,3 @@
 public @interface FunctionName {
     String value();
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/tracing/dtrace/ModuleName.java
--- a/src/share/classes/com/sun/tracing/dtrace/ModuleName.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tracing/dtrace/ModuleName.java	Tue Aug 12 19:52:29 2014 -0300
@@ -44,4 +44,3 @@
 public @interface ModuleName {
     String value();
 }
-
diff -r dde9f5cfde5f src/share/classes/com/sun/tracing/dtrace/StabilityLevel.java
--- a/src/share/classes/com/sun/tracing/dtrace/StabilityLevel.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tracing/dtrace/StabilityLevel.java	Tue Aug 12 19:52:29 2014 -0300
@@ -85,4 +85,3 @@
         this.encoding = encoding;
     }
 }
-
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/lang/management/MemoryUsage.java
--- a/src/share/classes/java/lang/management/MemoryUsage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/MemoryUsage.java	Tue Aug 12 19:52:29 2014 -0300
@@ -237,13 +237,16 @@
      * Returns a descriptive representation of this memory usage.
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder();
-        buf.append("init = " + init + "(" + (init >> 10) + "K) ");
-        buf.append("used = " + used + "(" + (used >> 10) + "K) ");
-        buf.append("committed = " + committed + "(" +
-                   (committed >> 10) + "K) " );
-        buf.append("max = " + max + "(" + (max >> 10) + "K)");
-        return buf.toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append("init = ").append(init).append('(').append(init >> 10)
+                .append("K) ");
+        sb.append("used = ").append(used).append('(').append(used >> 10)
+                .append("K) ");
+        sb.append("committed = ").append(committed).append('(')
+                .append(committed >> 10).append("K) ");
+        sb.append("max = ").append(max).append('(').append(max >> 10)
+                .append("K)");
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/java/lang/management/ThreadInfo.java
--- a/src/share/classes/java/lang/management/ThreadInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/ThreadInfo.java	Tue Aug 12 19:52:29 2014 -0300
@@ -579,15 +579,17 @@
      * @return a string representation of this thread info.
      */
     public String toString() {
-        StringBuilder sb = new StringBuilder("\"" + getThreadName() + "\"" +
-                                             " Id=" + getThreadId() + " " +
-                                             getThreadState());
+        StringBuilder sb = new StringBuilder();
+        sb.append('"').append(getThreadName()).append('"')
+        .append(" Id=").append(getThreadId()).append(' ')
+        .append(getThreadState());
+
         if (getLockName() != null) {
-            sb.append(" on " + getLockName());
+            sb.append(" on ").append(getLockName());
         }
         if (getLockOwnerName() != null) {
-            sb.append(" owned by \"" + getLockOwnerName() +
-                      "\" Id=" + getLockOwnerId());
+            sb.append(" owned by \"").append(getLockOwnerName())
+                    .append("\" Id=").append(getLockOwnerId());
         }
         if (isSuspended()) {
             sb.append(" (suspended)");
@@ -599,21 +601,21 @@
         int i = 0;
         for (; i < stackTrace.length && i < MAX_FRAMES; i++) {
             StackTraceElement ste = stackTrace[i];
-            sb.append("\tat " + ste.toString());
+            sb.append("\tat ").append(ste.toString());
             sb.append('\n');
             if (i == 0 && getLockInfo() != null) {
                 Thread.State ts = getThreadState();
                 switch (ts) {
                     case BLOCKED:
-                        sb.append("\t-  blocked on " + getLockInfo());
+                        sb.append("\t-  blocked on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case TIMED_WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     default:
@@ -622,7 +624,7 @@
 
             for (MonitorInfo mi : lockedMonitors) {
                 if (mi.getLockedStackDepth() == i) {
-                    sb.append("\t-  locked " + mi);
+                    sb.append("\t-  locked ").append(mi);
                     sb.append('\n');
                 }
             }
@@ -634,10 +636,10 @@
 
        LockInfo[] locks = getLockedSynchronizers();
        if (locks.length > 0) {
-           sb.append("\n\tNumber of locked synchronizers = " + locks.length);
+           sb.append("\n\tNumber of locked synchronizers = ").append(locks.length);
            sb.append('\n');
            for (LockInfo li : locks) {
-               sb.append("\t- " + li);
+               sb.append("\t- ").append(li);
                sb.append('\n');
            }
        }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/rmi/dgc/VMID.java
--- a/src/share/classes/java/rmi/dgc/VMID.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/rmi/dgc/VMID.java	Tue Aug 12 19:52:29 2014 -0300
@@ -124,8 +124,7 @@
         if (addr != null)
             for (int i = 0; i < addr.length; ++ i) {
                 int x = addr[i] & 0xFF;
-                sb.append((x < 0x10 ? "0" : "") +
-                          Integer.toString(x, 16));
+                sb.append(x < 0x10 ? "0" : "").append(Integer.toString(x, 16));
             }
         sb.append(':');
         sb.append(uid.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSigner.java
--- a/src/share/classes/java/security/CodeSigner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSigner.java	Tue Aug 12 19:52:29 2014 -0300
@@ -156,9 +156,9 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("Signer: " + signerCertPath.getCertificates().get(0));
+        sb.append("Signer: ").append(signerCertPath.getCertificates().get(0));
         if (timestamp != null) {
-            sb.append("timestamp: " + timestamp);
+            sb.append("timestamp: ").append(timestamp);
         }
         sb.append(")");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSource.java
--- a/src/share/classes/java/security/CodeSource.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSource.java	Tue Aug 12 19:52:29 2014 -0300
@@ -468,12 +468,12 @@
 
         if (this.certs != null && this.certs.length > 0) {
             for (int i = 0; i < this.certs.length; i++) {
-                sb.append( " " + this.certs[i]);
+                sb.append(' ').append(this.certs[i]);
             }
 
         } else if (this.signers != null && this.signers.length > 0) {
             for (int i = 0; i < this.signers.length; i++) {
-                sb.append( " " + this.signers[i]);
+                sb.append(' ').append(this.signers[i]);
             }
         } else {
             sb.append(" <no signer certificates>");
diff -r dde9f5cfde5f src/share/classes/java/security/KeyStore.java
--- a/src/share/classes/java/security/KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/KeyStore.java	Tue Aug 12 19:52:29 2014 -0300
@@ -610,8 +610,8 @@
          */
         public String toString() {
             StringBuilder sb = new StringBuilder();
-            sb.append("Private key entry and certificate chain with "
-                + chain.length + " elements:\r\n");
+            sb.append("Private key entry and certificate chain with ")
+                    .append(chain.length).append(" elements:\r\n");
             for (Certificate cert : chain) {
                 sb.append(cert);
                 sb.append("\r\n");
diff -r dde9f5cfde5f src/share/classes/java/security/PermissionCollection.java
--- a/src/share/classes/java/security/PermissionCollection.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/PermissionCollection.java	Tue Aug 12 19:52:29 2014 -0300
@@ -179,13 +179,13 @@
     public String toString() {
         Enumeration<Permission> enum_ = elements();
         StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()+" (\n");
+        sb.append(super.toString()).append(" (\n");
         while (enum_.hasMoreElements()) {
             try {
-                sb.append(" ");
+                sb.append(' ');
                 sb.append(enum_.nextElement().toString());
-                sb.append("\n");
-            } catch (NoSuchElementException e){
+                sb.append('\n');
+            } catch (NoSuchElementException e) {
                 // ignore
             }
         }
diff -r dde9f5cfde5f src/share/classes/java/security/ProtectionDomain.java
--- a/src/share/classes/java/security/ProtectionDomain.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/ProtectionDomain.java	Tue Aug 12 19:52:29 2014 -0300
@@ -285,34 +285,32 @@
     /**
      * Convert a ProtectionDomain to a String.
      */
-    @Override public String toString() {
+        @Override
+    public String toString() {
         String pals = "<no principals>";
         if (principals != null && principals.length > 0) {
-            StringBuilder palBuf = new StringBuilder("(principals ");
+            StringBuilder palBuilder = new StringBuilder("(principals ");
 
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                            " \"" + principals[i].getName() +
-                            "\"");
-                if (i < principals.length-1)
-                    palBuf.append(",\n");
-                else
-                    palBuf.append(")\n");
+                palBuilder.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append('"');
+                if (i < principals.length - 1) {
+                    palBuilder.append(",\n");
+                } else {
+                    palBuilder.append(")\n");
+                }
             }
-            pals = palBuf.toString();
+            pals = palBuilder.toString();
         }
 
         // Check if policy is set; we don't want to load
         // the policy prematurely here
-        PermissionCollection pc = Policy.isSet() && seeAllp() ?
-                                      mergePermissions():
-                                      getPermissions();
+        PermissionCollection pc = Policy.isSet() && seeAllp() ? mergePermissions()
+                : getPermissions();
 
-        return "ProtectionDomain "+
-            " "+codesource+"\n"+
-            " "+classloader+"\n"+
-            " "+pals+"\n"+
-            " "+pc+"\n";
+        return "ProtectionDomain " + " " + codesource + "\n" + " "
+                + classloader + "\n" + " " + pals + "\n" + " " + pc + "\n";
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/java/security/Timestamp.java
--- a/src/share/classes/java/security/Timestamp.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/Timestamp.java	Tue Aug 12 19:52:29 2014 -0300
@@ -143,10 +143,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("timestamp: " + timestamp);
+        sb.append("timestamp: ").append(timestamp);
         List<? extends Certificate> certs = signerCertPath.getCertificates();
         if (!certs.isEmpty()) {
-            sb.append("TSA: " + certs.get(0));
+            sb.append("TSA: ").append(certs.get(0));
         } else {
             sb.append("TSA: <empty>");
         }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CertPath.java
--- a/src/share/classes/java/security/cert/CertPath.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CertPath.java	Tue Aug 12 19:52:29 2014 -0300
@@ -221,20 +221,16 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        Iterator<? extends Certificate> stringIterator =
-                                        getCertificates().iterator();
 
-        sb.append("\n" + type + " Cert Path: length = "
-            + getCertificates().size() + ".\n");
-        sb.append("[\n");
+        sb.append('\n').append(type).append(" Cert Path: length = ")
+                .append(getCertificates().size()).append(".\n").append("[\n");
         int i = 1;
-        while (stringIterator.hasNext()) {
+        for (Certificate stringCert : getCertificates()) {
             sb.append("=========================================="
-                + "===============Certificate " + i + " start.\n");
-            Certificate stringCert = stringIterator.next();
+                 + "===============Certificate ").append(i).append(" start.\n");
             sb.append(stringCert.toString());
             sb.append("\n========================================"
-                + "=================Certificate " + i + " end.\n\n\n");
+                + "=================Certificate ").append(i).append(" end.\n\n\n");
             i++;
         }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CollectionCertStoreParameters.java
--- a/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Tue Aug 12 19:52:29 2014 -0300
@@ -134,8 +134,8 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CollectionCertStoreParameters: [\n");
-        sb.append("  collection: " + coll + "\n");
-        sb.append("]");
+        sb.append("  collection: ").append(coll).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/LDAPCertStoreParameters.java
--- a/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Tue Aug 12 19:52:29 2014 -0300
@@ -141,9 +141,9 @@
         StringBuilder sb = new StringBuilder();
         sb.append("LDAPCertStoreParameters: [\n");
 
-        sb.append("  serverName: " + serverName + "\n");
-        sb.append("  port: " + port + "\n");
-        sb.append("]");
+        sb.append("  serverName: ").append(serverName).append('\n');
+        sb.append("  port: ").append(port).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXBuilderParameters.java
--- a/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Tue Aug 12 19:52:29 2014 -0300
@@ -192,7 +192,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Maximum Path Length: " + maxPathLength + "\n");
+        sb.append("  Maximum Path Length: ").append(maxPathLength).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Tue Aug 12 19:52:29 2014 -0300
@@ -109,11 +109,13 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathBuilderResult: [\n");
-        sb.append("  Certification Path: " + certPath + "\n");
-        sb.append("  Trust Anchor: " + getTrustAnchor().toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(getPolicyTree()) + "\n");
-        sb.append("  Subject Public Key: " + getPublicKey() + "\n");
-        sb.append("]");
+        sb.append("  Certification Path: ").append(certPath).append('\n');
+        sb.append("  Trust Anchor: ").append(getTrustAnchor().toString())
+                .append('\n');
+        sb.append("  Policy Tree: ").append(String.valueOf(getPolicyTree()))
+                .append('\n');
+        sb.append("  Subject Public Key: ").append(getPublicKey()).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Tue Aug 12 19:52:29 2014 -0300
@@ -150,10 +150,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathValidatorResult: [\n");
-        sb.append("  Trust Anchor: " + trustAnchor.toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(policyTree) + "\n");
-        sb.append("  Subject Public Key: " + subjectPublicKey + "\n");
-        sb.append("]");
+        sb.append("  Trust Anchor: ").append(trustAnchor.toString()).append('\n');
+        sb.append("  Policy Tree: ").append(String.valueOf(policyTree)).append('\n');
+        sb.append("  Subject Public Key: ").append(subjectPublicKey).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXParameters.java
--- a/src/share/classes/java/security/cert/PKIXParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXParameters.java	Tue Aug 12 19:52:29 2014 -0300
@@ -698,8 +698,8 @@
 
         /* start with trusted anchor info */
         if (unmodTrustAnchors != null) {
-            sb.append("  Trust Anchors: " + unmodTrustAnchors.toString()
-                + "\n");
+            sb.append("  Trust Anchors: ").append(unmodTrustAnchors.toString())
+                    .append('\n');
         }
 
         /* now, append initial state information */
@@ -707,30 +707,41 @@
             if (unmodInitialPolicies.isEmpty()) {
                 sb.append("  Initial Policy OIDs: any\n");
             } else {
-                sb.append("  Initial Policy OIDs: ["
-                    + unmodInitialPolicies.toString() + "]\n");
+                sb.append("  Initial Policy OIDs: [")
+                        .append(unmodInitialPolicies.toString()).append("]\n");
             }
         }
 
         /* now, append constraints on all certificates in the path */
-        sb.append("  Validity Date: " + String.valueOf(date) + "\n");
-        sb.append("  Signature Provider: " + String.valueOf(sigProvider) + "\n");
-        sb.append("  Default Revocation Enabled: " + revocationEnabled + "\n");
-        sb.append("  Explicit Policy Required: " + explicitPolicyRequired + "\n");
-        sb.append("  Policy Mapping Inhibited: " + policyMappingInhibited + "\n");
-        sb.append("  Any Policy Inhibited: " + anyPolicyInhibited + "\n");
-        sb.append("  Policy Qualifiers Rejected: " + policyQualifiersRejected + "\n");
+        sb.append("  Validity Date: ").append(String.valueOf(date))
+                .append('\n');
+        sb.append("  Signature Provider: ").append(String.valueOf(sigProvider))
+                .append('\n');
+        sb.append("  Default Revocation Enabled: ").append(revocationEnabled)
+                .append('\n');
+        sb.append("  Explicit Policy Required: ")
+                .append(explicitPolicyRequired).append('\n');
+        sb.append("  Policy Mapping Inhibited: ")
+                .append(policyMappingInhibited).append('\n');
+        sb.append("  Any Policy Inhibited: ").append(anyPolicyInhibited)
+                .append('\n');
+        sb.append("  Policy Qualifiers Rejected: ")
+                .append(policyQualifiersRejected).append('\n');
 
         /* now, append target cert requirements */
-        sb.append("  Target Cert Constraints: " + String.valueOf(certSelector) + "\n");
+        sb.append("  Target Cert Constraints: ")
+                .append(String.valueOf(certSelector)).append('\n');
 
         /* finally, append miscellaneous parameters */
-        if (certPathCheckers != null)
-            sb.append("  Certification Path Checkers: ["
-                + certPathCheckers.toString() + "]\n");
-        if (certStores != null)
-            sb.append("  CertStores: [" + certStores.toString() + "]\n");
-        sb.append("]");
+        if (certPathCheckers != null) {
+            sb.append("  Certification Path Checkers: [")
+                    .append(certPathCheckers.toString()).append("]\n");
+        }
+        if (certStores != null) {
+            sb.append("  CertStores: [").append(certStores.toString())
+                    .append("]\n");
+        }
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PolicyQualifierInfo.java
--- a/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Tue Aug 12 19:52:29 2014 -0300
@@ -158,15 +158,17 @@
      *         {@code PolicyQualifierInfo}
      */
     public String toString() {
-        if (pqiString != null)
+        if (pqiString != null) {
             return pqiString;
+        }
         HexDumpEncoder enc = new HexDumpEncoder();
         StringBuilder sb = new StringBuilder();
         sb.append("PolicyQualifierInfo: [\n");
-        sb.append("  qualifierID: " + mId + "\n");
-        sb.append("  qualifier: " +
-            (mData == null ? "null" : enc.encodeBuffer(mData)) + "\n");
-        sb.append("]");
+        sb.append("  qualifierID: ").append(mId).append('\n');
+        sb.append("  qualifier: ")
+                .append(mData == null ? "null" : enc.encodeBuffer(mData))
+                .append('\n');
+        sb.append(']');
         pqiString = sb.toString();
         return pqiString;
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/TrustAnchor.java
--- a/src/share/classes/java/security/cert/TrustAnchor.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/TrustAnchor.java	Tue Aug 12 19:52:29 2014 -0300
@@ -320,14 +320,18 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         if (pubKey != null) {
-            sb.append("  Trusted CA Public Key: " + pubKey.toString() + "\n");
-            sb.append("  Trusted CA Issuer Name: "
-                + String.valueOf(caName) + "\n");
+            sb.append("  Trusted CA Public Key: ").append(pubKey.toString())
+                    .append('\n');
+            sb.append("  Trusted CA Issuer Name: ")
+                    .append(String.valueOf(caName)).append('\n');
         } else {
-            sb.append("  Trusted CA cert: " + trustedCert.toString() + "\n");
+            sb.append("  Trusted CA cert: ").append(trustedCert.toString())
+                    .append('\n');
         }
-        if (nc != null)
-            sb.append("  Name Constraints: " + nc.toString() + "\n");
+        if (nc != null) {
+            sb.append("  Name Constraints: ").append(nc.toString())
+                    .append('\n');
+        }
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CRLSelector.java
--- a/src/share/classes/java/security/cert/X509CRLSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CRLSelector.java	Tue Aug 12 19:52:29 2014 -0300
@@ -572,17 +572,17 @@
             sb.append("  IssuerNames:\n");
             Iterator<Object> i = issuerNames.iterator();
             while (i.hasNext())
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
         }
         if (minCRL != null)
-            sb.append("  minCRLNumber: " + minCRL + "\n");
+            sb.append("  minCRLNumber: ").append(minCRL).append('\n');
         if (maxCRL != null)
-            sb.append("  maxCRLNumber: " + maxCRL + "\n");
+            sb.append("  maxCRLNumber: ").append(maxCRL).append('\n');
         if (dateAndTime != null)
-            sb.append("  dateAndTime: " + dateAndTime + "\n");
+            sb.append("  dateAndTime: ").append(dateAndTime).append('\n');
         if (certChecking != null)
-            sb.append("  Certificate being checked: " + certChecking + "\n");
-        sb.append("]");
+            sb.append("  Certificate being checked: ").append(certChecking).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CertSelector.java
--- a/src/share/classes/java/security/cert/X509CertSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CertSelector.java	Tue Aug 12 19:52:29 2014 -0300
@@ -1814,72 +1814,75 @@
         StringBuilder sb = new StringBuilder();
         sb.append("X509CertSelector: [\n");
         if (x509Cert != null) {
-            sb.append("  Certificate: " + x509Cert.toString() + "\n");
+            sb.append("  Certificate: ").append(x509Cert.toString())
+                    .append('\n');
         }
         if (serialNumber != null) {
-            sb.append("  Serial Number: " + serialNumber.toString() + "\n");
+            sb.append("  Serial Number: ").append(serialNumber.toString())
+                    .append('\n');
         }
         if (issuer != null) {
-            sb.append("  Issuer: " + getIssuerAsString() + "\n");
+            sb.append("  Issuer: ").append(getIssuerAsString()).append('\n');
         }
         if (subject != null) {
-            sb.append("  Subject: " + getSubjectAsString() + "\n");
+            sb.append("  Subject: ").append(getSubjectAsString()).append('\n');
         }
-        sb.append("  matchAllSubjectAltNames flag: "
-                  + String.valueOf(matchAllSubjectAltNames) + "\n");
+        sb.append("  matchAllSubjectAltNames flag: ")
+                .append(String.valueOf(matchAllSubjectAltNames)).append('\n');
         if (subjectAlternativeNames != null) {
             sb.append("  SubjectAlternativeNames:\n");
             Iterator<List<?>> i = subjectAlternativeNames.iterator();
             while (i.hasNext()) {
                 List<?> list = i.next();
-                sb.append("    type " + list.get(0) +
-                          ", name " + list.get(1) + "\n");
+                sb.append("    type ").append(list.get(0)).append(", name ")
+                        .append(list.get(1)).append('\n');
             }
         }
         if (subjectKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Subject Key Identifier: " +
-                      enc.encodeBuffer(subjectKeyID) + "\n");
+            sb.append("  Subject Key Identifier: ")
+                    .append(enc.encodeBuffer(subjectKeyID)).append('\n');
         }
         if (authorityKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Authority Key Identifier: " +
-                      enc.encodeBuffer(authorityKeyID) + "\n");
+            sb.append("  Authority Key Identifier: ")
+                    .append(enc.encodeBuffer(authorityKeyID)).append('\n');
         }
         if (certificateValid != null) {
-            sb.append("  Certificate Valid: " +
-                      certificateValid.toString() + "\n");
+            sb.append("  Certificate Valid: ")
+                    .append(certificateValid.toString()).append('\n');
         }
         if (privateKeyValid != null) {
-            sb.append("  Private Key Valid: " +
-                      privateKeyValid.toString() + "\n");
+            sb.append("  Private Key Valid: ")
+                    .append(privateKeyValid.toString()).append('\n');
         }
         if (subjectPublicKeyAlgID != null) {
-            sb.append("  Subject Public Key AlgID: " +
-                      subjectPublicKeyAlgID.toString() + "\n");
+            sb.append("  Subject Public Key AlgID: ")
+                    .append(subjectPublicKeyAlgID.toString()).append('\n');
         }
         if (subjectPublicKey != null) {
-            sb.append("  Subject Public Key: " +
-                      subjectPublicKey.toString() + "\n");
+            sb.append("  Subject Public Key: ")
+                    .append(subjectPublicKey.toString()).append('\n');
         }
         if (keyUsage != null) {
-            sb.append("  Key Usage: " + keyUsageToString(keyUsage) + "\n");
+            sb.append("  Key Usage: ").append(keyUsageToString(keyUsage))
+                    .append('\n');
         }
         if (keyPurposeSet != null) {
-            sb.append("  Extended Key Usage: " +
-                      keyPurposeSet.toString() + "\n");
+            sb.append("  Extended Key Usage: ")
+                    .append(keyPurposeSet.toString()).append('\n');
         }
         if (policy != null) {
-            sb.append("  Policy: " + policy.toString() + "\n");
+            sb.append("  Policy: ").append(policy.toString()).append('\n');
         }
         if (pathToGeneralNames != null) {
             sb.append("  Path to names:\n");
             Iterator<GeneralNameInterface> i = pathToGeneralNames.iterator();
             while (i.hasNext()) {
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
             }
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/text/ChoiceFormat.java
--- a/src/share/classes/java/text/ChoiceFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/text/ChoiceFormat.java	Tue Aug 12 19:52:29 2014 -0300
@@ -272,7 +272,7 @@
             double tryLess = Math.abs(Math.IEEEremainder(less, 1.0d));
 
             if (tryLessOrEqual < tryLess) {
-                result.append(""+choiceLimits[i]);
+                result.append(choiceLimits[i]);
                 result.append('#');
             } else {
                 if (choiceLimits[i] == Double.POSITIVE_INFINITY) {
@@ -280,7 +280,7 @@
                 } else if (choiceLimits[i] == Double.NEGATIVE_INFINITY) {
                     result.append("-\u221E");
                 } else {
-                    result.append(""+less);
+                    result.append(less);
                 }
                 result.append('<');
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/util/Scanner.java
--- a/src/share/classes/java/util/Scanner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/Scanner.java	Tue Aug 12 19:52:29 2014 -0300
@@ -1304,20 +1304,20 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.Scanner");
-        sb.append("[delimiters=" + delimPattern + "]");
-        sb.append("[position=" + position + "]");
-        sb.append("[match valid=" + matchValid + "]");
-        sb.append("[need input=" + needInput + "]");
-        sb.append("[source closed=" + sourceClosed + "]");
-        sb.append("[skipped=" + skipped + "]");
-        sb.append("[group separator=" + groupSeparator + "]");
-        sb.append("[decimal separator=" + decimalSeparator + "]");
-        sb.append("[positive prefix=" + positivePrefix + "]");
-        sb.append("[negative prefix=" + negativePrefix + "]");
-        sb.append("[positive suffix=" + positiveSuffix + "]");
-        sb.append("[negative suffix=" + negativeSuffix + "]");
-        sb.append("[NaN string=" + nanString + "]");
-        sb.append("[infinity string=" + infinityString + "]");
+        sb.append("[delimiters=").append(delimPattern).append(']');
+        sb.append("[position=").append(position).append(']');
+        sb.append("[match valid=").append(matchValid).append(']');
+        sb.append("[need input=").append(needInput).append(']');
+        sb.append("[source closed=").append(sourceClosed).append(']');
+        sb.append("[skipped=").append(skipped).append(']');
+        sb.append("[group separator=").append(groupSeparator).append(']');
+        sb.append("[decimal separator=").append(decimalSeparator).append(']');
+        sb.append("[positive prefix=").append(positivePrefix).append(']');
+        sb.append("[negative prefix=").append(negativePrefix).append(']');
+        sb.append("[positive suffix=").append(positiveSuffix).append(']');
+        sb.append("[negative suffix=").append(negativeSuffix).append(']');
+        sb.append("[NaN string=").append(nanString).append(']');
+        sb.append("[infinity string=").append(infinityString).append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
--- a/src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java	Tue Aug 12 19:52:29 2014 -0300
@@ -274,4 +274,3 @@
     }
 
 }
-
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Matcher.java
--- a/src/share/classes/java/util/regex/Matcher.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Matcher.java	Tue Aug 12 19:52:29 2014 -0300
@@ -1295,14 +1295,14 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.regex.Matcher");
-        sb.append("[pattern=" + pattern());
+        sb.append("[pattern=").append(pattern());
         sb.append(" region=");
-        sb.append(regionStart() + "," + regionEnd());
+        sb.append(regionStart()).append(',').append(regionEnd());
         sb.append(" lastmatch=");
         if ((first >= 0) && (group() != null)) {
             sb.append(group());
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Pattern.java
--- a/src/share/classes/java/util/regex/Pattern.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Pattern.java	Tue Aug 12 19:52:29 2014 -0300
@@ -1488,10 +1488,10 @@
         for(int x=0; x<perms.length; x++) {
             String next = base + perms[x];
             if (x>0)
-                result.append("|"+next);
+                result.append('|').append(next);
             next = composeOneStep(next);
             if (next != null)
-                result.append("|"+produceEquivalentAlternation(next));
+                result.append('|').append(produceEquivalentAlternation(next));
         }
         return result.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/util/stream/FindOps.java
--- a/src/share/classes/java/util/stream/FindOps.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/stream/FindOps.java	Tue Aug 12 19:52:29 2014 -0300
@@ -315,4 +315,3 @@
         }
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/java/util/stream/MatchOps.java
--- a/src/share/classes/java/util/stream/MatchOps.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/stream/MatchOps.java	Tue Aug 12 19:52:29 2014 -0300
@@ -315,4 +315,3 @@
         }
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/java/util/stream/SpinedBuffer.java
--- a/src/share/classes/java/util/stream/SpinedBuffer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/stream/SpinedBuffer.java	Tue Aug 12 19:52:29 2014 -0300
@@ -1058,4 +1058,3 @@
         }
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/java/util/stream/StreamSpliterators.java
--- a/src/share/classes/java/util/stream/StreamSpliterators.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/stream/StreamSpliterators.java	Tue Aug 12 19:52:29 2014 -0300
@@ -1545,4 +1545,3 @@
         }
     }
 }
-
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/management/MBeanPermission.java
--- a/src/share/classes/javax/management/MBeanPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/MBeanPermission.java	Tue Aug 12 19:52:30 2014 -0300
@@ -455,11 +455,11 @@
         name.append(className);
         if (member == null)
             member = "-";
-        name.append("#" + member);
+        name.append('#').append(member);
         if (objectName == null)
             name.append("[-]");
         else
-            name.append("[").append(objectName.getCanonicalName()).append("]");
+            name.append('[').append(objectName.getCanonicalName()).append(']');
 
         /* In the interests of legibility for Permission.toString(), we
            transform the empty string into "*".  */
diff -r dde9f5cfde5f src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
--- a/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Aug 12 19:52:30 2014 -0300
@@ -716,15 +716,14 @@
         }
 
         retStr.append("\nMBeanInfo for ModelMBean is:");
-        retStr.append("\nCLASSNAME: \t"+ info.getClassName());
-        retStr.append("\nDESCRIPTION: \t"+ info.getDescription());
+        retStr.append("\nCLASSNAME: \t").append(info.getClassName());
+        retStr.append("\nDESCRIPTION: \t").append(info.getDescription());
 
 
         try {
-            retStr.append("\nMBEAN DESCRIPTOR: \t"+
-                          info.getMBeanDescriptor());
+            retStr.append("\nMBEAN DESCRIPTOR: \t").append(info.getMBeanDescriptor());
         } catch (Exception e) {
-            retStr.append("\nMBEAN DESCRIPTOR: \t" + " is invalid");
+            retStr.append("\nMBEAN DESCRIPTOR: \t  is invalid");
         }
 
         retStr.append("\nATTRIBUTES");
@@ -734,13 +733,12 @@
             for (int i=0; i<attrInfo.length; i++) {
                 final ModelMBeanAttributeInfo attInfo =
                     (ModelMBeanAttributeInfo)attrInfo[i];
-                retStr.append(" ** NAME: \t"+ attInfo.getName());
-                retStr.append("    DESCR: \t"+ attInfo.getDescription());
-                retStr.append("    TYPE: \t"+ attInfo.getType() +
-                              "    READ: \t"+ attInfo.isReadable() +
-                              "    WRITE: \t"+ attInfo.isWritable());
-                retStr.append("    DESCRIPTOR: " +
-                              attInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(attInfo.getName());
+                retStr.append("    DESCR: \t").append(attInfo.getDescription());
+                retStr.append("    TYPE: \t").append(attInfo.getType())
+                        .append("    READ: \t").append(attInfo.isReadable())
+                        .append("    WRITE: \t").append(attInfo.isWritable());
+                retStr.append("    DESCRIPTOR: ").append(attInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No attributes **");
@@ -752,14 +750,12 @@
             for (int i=0; i<constrInfo.length; i++) {
                 final ModelMBeanConstructorInfo ctorInfo =
                     (ModelMBeanConstructorInfo)constrInfo[i];
-                retStr.append(" ** NAME: \t"+ ctorInfo.getName());
-                retStr.append("    DESCR: \t"+
-                              ctorInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              ctorInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              ctorInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(ctorInfo.getName());
+                retStr.append("    DESCR: \t").append(ctorInfo.getDescription());
+                retStr.append("    PARAM: \t").append(ctorInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ")
+                        .append(ctorInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No Constructors **");
@@ -771,13 +767,11 @@
             for (int i=0; i<opsInfo.length; i++) {
                 final ModelMBeanOperationInfo operInfo =
                     (ModelMBeanOperationInfo)opsInfo[i];
-                retStr.append(" ** NAME: \t"+ operInfo.getName());
-                retStr.append("    DESCR: \t"+ operInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              operInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              operInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(operInfo.getName());
+                retStr.append("    DESCR: \t").append(operInfo.getDescription());
+                retStr.append("    PARAM: \t").append(operInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ").append(operInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No operations ** ");
@@ -790,10 +784,9 @@
             for (int i=0; i<notifInfo.length; i++) {
                 final ModelMBeanNotificationInfo nInfo =
                     (ModelMBeanNotificationInfo)notifInfo[i];
-                retStr.append(" ** NAME: \t"+ nInfo.getName());
-                retStr.append("    DESCR: \t"+ nInfo.getDescription());
-                retStr.append("    DESCRIPTOR: " +
-                              nInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(nInfo.getName());
+                retStr.append("    DESCR: \t").append(nInfo.getDescription());
+                retStr.append("    DESCRIPTOR: ").append(nInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No notifications **");
diff -r dde9f5cfde5f src/share/classes/javax/management/openmbean/CompositeType.java
--- a/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Aug 12 19:52:30 2014 -0300
@@ -463,7 +463,7 @@
                 result.append("(itemName=");
                 result.append(key);
                 result.append(",itemType=");
-                result.append(nameToType.get(key).toString() +")");
+                result.append(nameToType.get(key).toString()).append(')');
                 i++;
             }
             result.append("))");
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/Role.java
--- a/src/share/classes/javax/management/relation/Role.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/Role.java	Tue Aug 12 19:52:30 2014 -0300
@@ -226,17 +226,17 @@
      * @return the description of the role.
      */
     public String toString() {
-        StringBuilder result = new StringBuilder();
-        result.append("role name: " + name + "; role value: ");
-        for (Iterator<ObjectName> objNameIter = objectNameList.iterator();
-             objNameIter.hasNext();) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("role name: ").append(name).append("; role value: ");
+        for (Iterator<ObjectName> objNameIter = objectNameList.iterator(); objNameIter
+                .hasNext();) {
             ObjectName currObjName = objNameIter.next();
-            result.append(currObjName.toString());
+            sb.append(currObjName.toString());
             if (objNameIter.hasNext()) {
-                result.append(", ");
+                sb.append(", ");
             }
         }
-        return result.toString();
+        return sb.toString();
     }
 
     //
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleInfo.java
--- a/src/share/classes/javax/management/relation/RoleInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleInfo.java	Tue Aug 12 19:52:30 2014 -0300
@@ -456,13 +456,13 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role info name: " + name);
-        result.append("; isReadable: " + isReadable);
-        result.append("; isWritable: " + isWritable);
-        result.append("; description: " + description);
-        result.append("; minimum degree: " + minDegree);
-        result.append("; maximum degree: " + maxDegree);
-        result.append("; MBean class: " + referencedMBeanClassName);
+        result.append("role info name: ").append(name);
+        result.append("; isReadable: ").append(isReadable);
+        result.append("; isWritable: ").append(isWritable);
+        result.append("; description: ").append(description);
+        result.append("; minimum degree: ").append(minDegree);
+        result.append("; maximum degree: ").append(maxDegree);
+        result.append("; MBean class: ").append(referencedMBeanClassName);
         return result.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleUnresolved.java
--- a/src/share/classes/javax/management/relation/RoleUnresolved.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleUnresolved.java	Tue Aug 12 19:52:30 2014 -0300
@@ -282,7 +282,7 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role name: " + roleName);
+        result.append("role name: ").append(roleName);
         if (roleValue != null) {
             result.append("; value: ");
             for (Iterator<ObjectName> objNameIter = roleValue.iterator();
@@ -294,7 +294,7 @@
                 }
             }
         }
-        result.append("; problem type: " + problemType);
+        result.append("; problem type: ").append(problemType);
         return result.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/crypto/CryptoPermission.java
--- a/src/share/classes/javax/crypto/CryptoPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/crypto/CryptoPermission.java	Tue Aug 12 19:52:29 2014 -0300
@@ -369,22 +369,24 @@
      * @return information about this CryptoPermission.
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder(100);
-        buf.append("(CryptoPermission " + alg + " " + maxKeySize);
+        StringBuilder sb = new StringBuilder(100);
+        sb.append("(CryptoPermission ").append(alg).append(' ')
+                .append(maxKeySize);
         if (algParamSpec != null) {
             if (algParamSpec instanceof RC2ParameterSpec) {
-                buf.append(" , effective " +
-                    ((RC2ParameterSpec)algParamSpec).getEffectiveKeyBits());
+                sb.append(" , effective ")
+                        .append(((RC2ParameterSpec) algParamSpec)
+                                .getEffectiveKeyBits());
             } else if (algParamSpec instanceof RC5ParameterSpec) {
-                buf.append(" , rounds " +
-                    ((RC5ParameterSpec)algParamSpec).getRounds());
+                sb.append(" , rounds ").append(
+                        ((RC5ParameterSpec) algParamSpec).getRounds());
             }
         }
         if (exemptionMechanism != null) { // OPTIONAL
-            buf.append(" " + exemptionMechanism);
+            sb.append(' ').append(exemptionMechanism);
         }
-        buf.append(")");
-        return buf.toString();
+        sb.append(')');
+        return sb.toString();
     }
 
     private boolean impliesExemptionMechanism(String exemptionMechanism) {
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/naming/BinaryRefAddr.java
--- a/src/share/classes/javax/naming/BinaryRefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/BinaryRefAddr.java	Tue Aug 12 19:52:30 2014 -0300
@@ -165,11 +165,11 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Address Type: " + addrType + "\n");
-
+        StringBuilder str = new StringBuilder();
+        str.append("Address Type: ").append(addrType).append('\n');
         str.append("AddressContents: ");
         for (int i = 0; i<buf.length && i < 32; i++) {
-            str.append(Integer.toHexString(buf[i]) +" ");
+            str.append(Integer.toHexString(buf[i])).append(' ');
         }
         if (buf.length >= 32)
             str.append(" ...\n");
diff -r dde9f5cfde5f src/share/classes/javax/naming/NameImpl.java
--- a/src/share/classes/javax/naming/NameImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/NameImpl.java	Tue Aug 12 19:52:30 2014 -0300
@@ -170,7 +170,7 @@
                 endQuote = one ? syntaxEndQuote1 : syntaxEndQuote2;
 
                 i += syntaxTypevalSeparator.length();
-                answer.append(syntaxTypevalSeparator+beginQuote); // add back
+                answer.append(syntaxTypevalSeparator).append(beginQuote); // add back
 
                 // consume string until matching quote
                 for (i += beginQuote.length();
diff -r dde9f5cfde5f src/share/classes/javax/naming/RefAddr.java
--- a/src/share/classes/javax/naming/RefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/RefAddr.java	Tue Aug 12 19:52:30 2014 -0300
@@ -139,9 +139,9 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Type: " + addrType + "\n");
-
-        str.append("Content: " + getContent() + "\n");
+        StringBuilder str = new StringBuilder();
+        str.append("Type: ").append(addrType).append('\n');
+        str.append("Content: ").append(getContent()).append('\n');
         return (str.toString());
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
--- a/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Tue Aug 12 19:52:30 2014 -0300
@@ -651,8 +651,7 @@
         StringBuilder caddrString = new StringBuilder();
         if (clientAddresses != null) {
             for (int i = 0; i < clientAddresses.length; i++) {
-                caddrString.append("clientAddresses[" + i + "] = " +
-                        clientAddresses[i].toString());
+                caddrString.append("clientAddresses[").append(i).append("] = ").append(clientAddresses[i].toString());
             }
         }
         return ("Ticket (hex) = " + "\n" +
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/AudioFileFormat.java
--- a/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Tue Aug 12 19:52:30 2014 -0300
@@ -272,26 +272,25 @@
     @Override
     public String toString() {
 
-        StringBuffer buf = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         //$$fb2002-11-01: fix for 4672864: AudioFileFormat.toString() throws unexpected NullPointerException
         if (type != null) {
-            buf.append(type.toString() + " (." + type.getExtension() + ") file");
+            sb.append(type.toString()).append(" (.").append(type.getExtension()).append(") file");
         } else {
-            buf.append("unknown file format");
+            sb.append("unknown file format");
         }
 
         if (byteLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", byte length: " + byteLength);
+            sb.append(", byte length: ").append(byteLength);
         }
 
-        buf.append(", data format: " + format);
+        sb.append(", data format: ").append(format);
 
         if (frameLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", frame length: " + frameLength);
+            sb.append(", frame length: ").append(frameLength);
         }
-
-        return new String(buf);
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/DataLine.java
--- a/src/share/classes/javax/sound/sampled/DataLine.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/DataLine.java	Tue Aug 12 19:52:30 2014 -0300
@@ -473,17 +473,21 @@
             StringBuilder sb = new StringBuilder();
 
             if ( (formats.length == 1) && (formats[0] != null) ) {
-                sb.append(" supporting format " + formats[0]);
+                sb.append(" supporting format ").append(formats[0]);
             } else if (getFormats().length > 1) {
-                sb.append(" supporting " + getFormats().length + " audio formats");
+                                sb.append(" supporting ").append(getFormats().length)
+                                                .append(" audio formats");
             }
 
             if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (maxBufferSize != AudioSystem.NOT_SPECIFIED) ) {
-                sb.append(", and buffers of " + minBufferSize + " to " + maxBufferSize + " bytes");
+                                sb.append(", and buffers of ").append(minBufferSize)
+                                                .append(" to ").append(maxBufferSize).append(" bytes");
             } else if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (minBufferSize > 0) ) {
-                sb.append(", and buffers of at least " + minBufferSize + " bytes");
+                                sb.append(", and buffers of at least ").append(minBufferSize)
+                                                .append(" bytes");
             } else if (maxBufferSize != AudioSystem.NOT_SPECIFIED) {
-                sb.append(", and buffers of up to " + minBufferSize + " bytes");
+                                sb.append(", and buffers of up to ").append(minBufferSize)
+                                                .append(" bytes");
             }
 
             return new String(super.toString() + sb);
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/swing/GroupLayout.java
--- a/src/share/classes/javax/swing/GroupLayout.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/GroupLayout.java	Tue Aug 12 19:52:30 2014 -0300
@@ -1213,15 +1213,15 @@
             registerComponents(horizontalGroup, HORIZONTAL);
             registerComponents(verticalGroup, VERTICAL);
         }
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("HORIZONTAL\n");
-        createSpringDescription(buffer, horizontalGroup, "  ", HORIZONTAL);
-        buffer.append("\nVERTICAL\n");
-        createSpringDescription(buffer, verticalGroup, "  ", VERTICAL);
-        return buffer.toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append("HORIZONTAL\n");
+        createSpringDescription(sb, horizontalGroup, "  ", HORIZONTAL);
+        sb.append("\nVERTICAL\n");
+        createSpringDescription(sb, verticalGroup, "  ", VERTICAL);
+        return sb.toString();
     }
 
-    private void createSpringDescription(StringBuffer buffer, Spring spring,
+    private void createSpringDescription(StringBuilder sb, Spring spring,
             String indent, int axis) {
         String origin = "";
         String padding = "";
@@ -1239,20 +1239,19 @@
             padding = ", userCreated=" + paddingSpring.getUserCreated() +
                     ", matches=" + paddingSpring.getMatchDescription();
         }
-        buffer.append(indent + spring.getClass().getName() + " " +
-                Integer.toHexString(spring.hashCode()) + " " +
-                origin +
-                ", size=" + spring.getSize() +
-                ", alignment=" + spring.getAlignment() +
-                " prefs=[" + spring.getMinimumSize(axis) +
-                " " + spring.getPreferredSize(axis) +
-                " " + spring.getMaximumSize(axis) +
-                padding + "]\n");
+                sb.append(indent).append(spring.getClass().getName()).append(' ')
+                                .append(Integer.toHexString(spring.hashCode())).append(' ')
+                                .append(origin).append(", size=").append(spring.getSize())
+                                .append(", alignment=").append(spring.getAlignment())
+                                .append(" prefs=[").append(spring.getMinimumSize(axis))
+                                .append(' ').append(spring.getPreferredSize(axis)).append(' ')
+                                .append(spring.getMaximumSize(axis)).append(padding)
+                                .append("]\n");
         if (spring instanceof Group) {
             List<Spring> springs = ((Group)spring).springs;
             indent += "  ";
             for (int counter = 0; counter < springs.size(); counter++) {
-                createSpringDescription(buffer, springs.get(counter), indent,
+                createSpringDescription(sb, springs.get(counter), indent,
                         axis);
             }
         }
diff -r dde9f5cfde5f src/share/classes/javax/swing/JColorChooser.java
--- a/src/share/classes/javax/swing/JColorChooser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/JColorChooser.java	Tue Aug 12 19:52:30 2014 -0300
@@ -542,19 +542,19 @@
      *
      * @return  a string representation of this <code>JColorChooser</code>
      */
-    protected String paramString() {
-        StringBuilder chooserPanelsString = new StringBuilder("");
-        for (int i=0; i<chooserPanels.length; i++) {
-            chooserPanelsString.append("[" + chooserPanels[i].toString()
-                                       + "]");
+        protected String paramString() {
+                StringBuilder chooserPanelsString = new StringBuilder();
+                for (AbstractColorChooserPanel panel : chooserPanels) {
+                        chooserPanelsString.append('[').append(panel.toString())
+                                        .append(']');
+                }
+                String previewPanelString = (previewPanel != null ? previewPanel
+                                .toString() : "");
+
+                return super.paramString() + ",chooserPanels="
+                                + chooserPanelsString.toString() + ",previewPanel="
+                                + previewPanelString;
         }
-        String previewPanelString = (previewPanel != null ?
-                                     previewPanel.toString() : "");
-
-        return super.paramString() +
-        ",chooserPanels=" + chooserPanelsString.toString() +
-        ",previewPanel=" + previewPanelString;
-    }
 
 /////////////////
 // Accessibility support
diff -r dde9f5cfde5f src/share/classes/javax/swing/MultiUIDefaults.java
--- a/src/share/classes/javax/swing/MultiUIDefaults.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/MultiUIDefaults.java	Tue Aug 12 19:52:30 2014 -0300
@@ -190,18 +190,18 @@
 
     @Override
     public synchronized String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("{");
-        Enumeration<?> keys = keys();
-        while (keys.hasMoreElements()) {
-            Object key = keys.nextElement();
-            sb.append(key + "=" + get(key) + ", ");
-        }
-        int length = sb.length();
-        if (length > 1) {
-            sb.delete(length-2, length);
-        }
-        sb.append("}");
-        return sb.toString();
+                StringBuilder sb = new StringBuilder();
+                sb.append("{");
+                Enumeration<?> keys = keys();
+                while (keys.hasMoreElements()) {
+                        Object key = keys.nextElement();
+                        sb.append(key).append('=').append(get(key)).append(", ");
+                }
+                int length = sb.length();
+                if (length > 1) {
+                        sb.delete(length - 2, length);
+                }
+                sb.append('}');
+                return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/javax/swing/RepaintManager.java
--- a/src/share/classes/javax/swing/RepaintManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/RepaintManager.java	Tue Aug 12 19:52:30 2014 -0300
@@ -990,10 +990,7 @@
      * @return a String representation of this object
      */
     public synchronized String toString() {
-        StringBuilder sb = new StringBuilder();
-        if(dirtyComponents != null)
-            sb.append("" + dirtyComponents);
-        return sb.toString();
+                return dirtyComponents != null ? dirtyComponents.toString() : "";
     }
 
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/event/TreeModelEvent.java
--- a/src/share/classes/javax/swing/event/TreeModelEvent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/event/TreeModelEvent.java	Tue Aug 12 19:52:30 2014 -0300
@@ -294,21 +294,20 @@
     public String toString() {
         StringBuilder   sb = new StringBuilder();
 
-        sb.append(getClass().getName() + " " +
-                  Integer.toString(hashCode()));
+        sb.append(getClass().getName()).append(' ').append(Integer.toString(hashCode()));
         if(path != null)
-            sb.append(" path " + path);
+            sb.append(" path ").append(path);
         if(childIndices != null) {
             sb.append(" indices [ ");
             for(int counter = 0; counter < childIndices.length; counter++)
-                sb.append(Integer.toString(childIndices[counter])+ " ");
-            sb.append("]");
+                sb.append(Integer.toString(childIndices[counter])).append(' ');
+            sb.append(']');
         }
         if(children != null) {
             sb.append(" children [ ");
             for(int counter = 0; counter < children.length; counter++)
-                sb.append(children[counter] + " ");
-            sb.append("]");
+                sb.append(children[counter]).append(' ');
+            sb.append(']');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Aug 12 19:52:30 2014 -0300
@@ -1330,8 +1330,8 @@
 
             for (Object obj : values) {
                 String val = ((obj == null) ? "" : obj.toString());
-                plainBuf.append(val + "\n");
-                htmlBuf.append("  <li>" + val + "\n");
+                plainBuf.append(val).append('\n');
+                htmlBuf.append("  <li>").append(val).append('\n');
             }
 
             // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicListUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Tue Aug 12 19:52:30 2014 -0300
@@ -2948,8 +2948,8 @@
                 for (int i = 0; i < values.length; i++) {
                     Object obj = values[i];
                     String val = ((obj == null) ? "" : obj.toString());
-                    plainStr.append(val + "\n");
-                    htmlStr.append("  <li>" + val + "\n");
+                    plainStr.append(val).append('\n');
+                    htmlStr.append("  <li>").append(val).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTableUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Tue Aug 12 19:52:30 2014 -0300
@@ -2230,11 +2230,11 @@
                     for (int col = 0; col < cols.length; col++) {
                         Object obj = table.getValueAt(rows[row], cols[col]);
                         String val = ((obj == null) ? "" : obj.toString());
-                        plainStr.append(val + "\t");
-                        htmlStr.append("  <td>" + val + "</td>\n");
+                        plainStr.append(val).append('\t');
+                        htmlStr.append("  <td>").append(val).append("</td>\n");
                     }
                     // we want a newline at the end of each line and not a tab
-                    plainStr.deleteCharAt(plainStr.length() - 1).append("\n");
+                    plainStr.deleteCharAt(plainStr.length() - 1).append('\t');
                     htmlStr.append("</tr>\n");
                 }
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Tue Aug 12 19:52:30 2014 -0300
@@ -3618,8 +3618,8 @@
                     boolean leaf = model.isLeaf(node);
                     String label = getDisplayString(path, true, leaf);
 
-                    plainStr.append(label + "\n");
-                    htmlStr.append("  <li>" + label + "\n");
+                    plainStr.append(label).append('\n');
+                    htmlStr.append("  <li>").append(label).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java
--- a/src/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java	Tue Aug 12 19:52:30 2014 -0300
@@ -199,4 +199,3 @@
                          Math.min((int)(c.getBlue()/factor), 255));
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
--- a/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Tue Aug 12 19:52:30 2014 -0300
@@ -1160,15 +1160,15 @@
             rows = rowMapper.getRowsForPaths(selection);
         else
             rows = null;
-        sb.append(getClass().getName() + " " + hashCode() + " [ ");
+        sb.append(getClass().getName()).append(' ').append(hashCode()).append(" [ ");
         for(int counter = 0; counter < selCount; counter++) {
             if(rows != null)
-                sb.append(selection[counter].toString() + "@" +
-                          Integer.toString(rows[counter])+ " ");
+                sb.append(selection[counter].toString()).append('@')
+                        .append(Integer.toString(rows[counter])).append(' ');
             else
-                sb.append(selection[counter].toString() + " ");
+                sb.append(selection[counter].toString()).append(' ');
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/font/AttributeValues.java
--- a/src/share/classes/sun/font/AttributeValues.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/AttributeValues.java	Tue Aug 12 19:52:30 2014 -0300
@@ -542,7 +542,7 @@
                 }
             }
         }
-        b.append("[btx=" + baselineTransform + ", ctx=" + charTransform + "]");
+        b.append("[btx=").append(baselineTransform).append(", ctx=").append(charTransform).append(']');
         b.append('}');
         return b.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/font/Decoration.java
--- a/src/share/classes/sun/font/Decoration.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/Decoration.java	Tue Aug 12 19:52:30 2014 -0300
@@ -431,12 +431,12 @@
             StringBuilder sb = new StringBuilder();
             sb.append(super.toString());
             sb.append("[");
-            if (fgPaint != null) sb.append("fgPaint: " + fgPaint);
-            if (bgPaint != null) sb.append(" bgPaint: " + bgPaint);
+            if (fgPaint != null) sb.append("fgPaint: ").append(fgPaint);
+            if (bgPaint != null) sb.append(" bgPaint: ").append(bgPaint);
             if (swapColors) sb.append(" swapColors: true");
             if (strikethrough) sb.append(" strikethrough: true");
-            if (stdUnderline != null) sb.append(" stdUnderline: " + stdUnderline);
-            if (imUnderline != null) sb.append(" imUnderline: " + imUnderline);
+            if (stdUnderline != null) sb.append(" stdUnderline: ").append(stdUnderline);
+            if (imUnderline != null) sb.append(" imUnderline: ").append(imUnderline);
             sb.append("]");
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/font/StandardGlyphVector.java
--- a/src/share/classes/sun/font/StandardGlyphVector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/StandardGlyphVector.java	Tue Aug 12 19:52:30 2014 -0300
@@ -1894,9 +1894,9 @@
             }
         }
         catch(Exception e) {
-            buf.append(" " + e.getMessage());
+            buf.append(' ').append(e.getMessage());
         }
-        buf.append("}");
+        buf.append('}');
 
         return buf;
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/launcher/LauncherHelper.java
--- a/src/share/classes/sun/launcher/LauncherHelper.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/launcher/LauncherHelper.java	Tue Aug 12 19:52:30 2014 -0300
@@ -369,10 +369,9 @@
     static void appendVmErgoMessage(boolean isServerClass, String vm) {
         outBuf = outBuf.append(getLocalizedMessage("java.launcher.ergo.message1",
                 vm));
-        outBuf = (isServerClass)
-             ? outBuf.append(",\n" +
-                getLocalizedMessage("java.launcher.ergo.message2") + "\n\n")
-             : outBuf.append(".\n\n");
+                outBuf = (isServerClass) ? outBuf.append(",\n")
+                                .append(getLocalizedMessage("java.launcher.ergo.message2"))
+                                .append("\n\n") : outBuf.append(".\n\n");
     }
 
     /**
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/management/Agent.java
--- a/src/share/classes/sun/management/Agent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/Agent.java	Tue Aug 12 19:52:31 2014 -0300
@@ -502,7 +502,7 @@
         } else {
             StringBuilder message = new StringBuilder(params[0]);
             for (int i = 1; i < params.length; i++) {
-                message.append(" " + params[i]);
+                message.append(' ').append(params[i]);
             }
             error(key, message.toString());
         }
diff -r dde9f5cfde5f src/share/classes/sun/management/MappedMXBeanType.java
--- a/src/share/classes/sun/management/MappedMXBeanType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/MappedMXBeanType.java	Tue Aug 12 19:52:31 2014 -0300
@@ -289,7 +289,7 @@
             if (et.isPrimitive()) {
                 className = new StringBuilder(c.getName());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
@@ -385,7 +385,7 @@
             if (elementType instanceof Class && ((Class) elementType).isPrimitive()) {
                 className = new StringBuilder(gat.toString());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
--- a/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Tue Aug 12 19:52:31 2014 -0300
@@ -463,12 +463,12 @@
 
     // ---------
 
-    private static void appendIfLiteralAddress(String addr, StringBuffer sb) {
+    private static void appendIfLiteralAddress(String addr, StringBuilder sb) {
         if (IPAddressUtil.isIPv4LiteralAddress(addr)) {
-            sb.append("dns://" + addr + " ");
+            sb.append("dns://").append(addr).append(' ');
         } else {
             if (IPAddressUtil.isIPv6LiteralAddress(addr)) {
-                sb.append("dns://[" + addr + "] ");
+                sb.append("dns://[").append(addr).append("] ");
             }
         }
     }
@@ -478,7 +478,7 @@
      *         corresponding to the supplied List of nameservers.
      */
     private static String createProviderURL(List<String> nsList) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (String s: nsList) {
             appendIfLiteralAddress(s, sb);
         }
@@ -491,7 +491,7 @@
      *         contained in the provided str.
      */
     private static String createProviderURL(String str) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         StringTokenizer st = new StringTokenizer(str, ",");
         while (st.hasMoreTokens()) {
             appendIfLiteralAddress(st.nextToken(), sb);
diff -r dde9f5cfde5f src/share/classes/sun/net/util/URLUtil.java
--- a/src/share/classes/sun/net/util/URLUtil.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/util/URLUtil.java	Tue Aug 12 19:52:31 2014 -0300
@@ -77,4 +77,3 @@
         return strForm.toString();
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/net/www/HeaderParser.java
--- a/src/share/classes/sun/net/www/HeaderParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/HeaderParser.java	Tue Aug 12 19:52:31 2014 -0300
@@ -220,21 +220,23 @@
 
     public String toString () {
         Iterator<String> k = keys();
-        StringBuffer sbuf = new StringBuffer();
-        sbuf.append ("{size="+asize+" nkeys="+nkeys+" ");
+        StringBuilder sb = new StringBuilder();
+                sb.append("{size=").append(asize).append(" nkeys=").append(nkeys)
+                                .append(' ');
         for (int i=0; k.hasNext(); i++) {
             String key = k.next();
             String val = findValue (i);
             if (val != null && "".equals (val)) {
                 val = null;
             }
-            sbuf.append (" {"+key+(val==null?"":","+val)+"}");
+                        sb.append(" {").append(key).append(val == null ? "" : "," + val)
+                                        .append('}');
             if (k.hasNext()) {
-                sbuf.append (",");
+                sb.append (',');
             }
         }
-        sbuf.append (" }");
-        return new String (sbuf);
+        sb.append (" }");
+        return new String (sb);
     }
 
     public int findInt(String k, int Default) {
diff -r dde9f5cfde5f src/share/classes/sun/net/www/MimeEntry.java
--- a/src/share/classes/sun/net/www/MimeEntry.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/MimeEntry.java	Tue Aug 12 19:52:31 2014 -0300
@@ -288,7 +288,7 @@
 
         int action = getAction();
         if (action != MimeEntry.UNKNOWN) {
-            sb.append("action=" + actionKeywords[action]);
+            sb.append("action=").append(actionKeywords[action]);
             needSeparator = true;
         }
 
@@ -297,7 +297,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("application=" + command);
+            sb.append("application=").append(command);
             needSeparator = true;
         }
 
@@ -305,7 +305,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("icon=" + getImageFileName());
+            sb.append("icon=").append(getImageFileName());
             needSeparator = true;
         }
 
@@ -314,7 +314,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("file_extensions=" + extensions);
+            sb.append("file_extensions=").append(extensions);
             needSeparator = true;
         }
 
@@ -323,7 +323,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("description=" + description);
+            sb.append("description=").append(description);
         }
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/net/www/protocol/http/AuthScheme.java
--- a/src/share/classes/sun/net/www/protocol/http/AuthScheme.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/protocol/http/AuthScheme.java	Tue Aug 12 19:52:31 2014 -0300
@@ -35,4 +35,3 @@
     KERBEROS,
     UNKNOWN;
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java
--- a/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java	Tue Aug 12 19:52:31 2014 -0300
@@ -202,4 +202,3 @@
         return npath;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/net/www/protocol/http/Negotiator.java
--- a/src/share/classes/sun/net/www/protocol/http/Negotiator.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/protocol/http/Negotiator.java	Tue Aug 12 19:52:31 2014 -0300
@@ -81,4 +81,3 @@
         }
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java
--- a/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java	Tue Aug 12 19:52:31 2014 -0300
@@ -56,4 +56,3 @@
         public boolean isTrustedSite(URL url) { return true; }
     }
 }
-
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/security/acl/AclEntryImpl.java
--- a/src/share/classes/sun/security/acl/AclEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/acl/AclEntryImpl.java	Tue Aug 12 19:52:31 2014 -0300
@@ -137,26 +137,30 @@
     /**
      * Return a string representation of  the contents of the ACL entry.
      */
-    public String toString() {
-        StringBuffer s = new StringBuffer();
-        if (negative)
-          s.append("-");
-        else
-          s.append("+");
-        if (user instanceof Group)
-            s.append("Group.");
-        else
-            s.append("User.");
-        s.append(user + "=");
-        Enumeration<Permission> e = permissions();
-        while(e.hasMoreElements()) {
-            Permission p = e.nextElement();
-            s.append(p);
-            if (e.hasMoreElements())
-                s.append(",");
+        public String toString() {
+                StringBuffer sb = new StringBuffer();
+                if (negative) {
+                        sb.append('-');
+                } else {
+                        sb.append('+');
+                }
+                if (user instanceof Group) {
+                        sb.append("Group.");
+                } else {
+                        sb.append("User.");
+                }
+                sb.append(user).append('=');
+
+                Enumeration<Permission> e = permissions();
+                while (e.hasMoreElements()) {
+                        Permission p = e.nextElement();
+                        sb.append(p);
+                        if (e.hasMoreElements()) {
+                                sb.append(',');
+                        }
+                }
+                return sb.toString();
         }
-        return new String(s);
-    }
 
     /**
      * Clones an AclEntry.
diff -r dde9f5cfde5f src/share/classes/sun/security/jgss/GSSCaller.java
--- a/src/share/classes/sun/security/jgss/GSSCaller.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/jgss/GSSCaller.java	Tue Aug 12 19:52:31 2014 -0300
@@ -46,4 +46,3 @@
         return "GSSCaller{" + name + '}';
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/jgss/HttpCaller.java
--- a/src/share/classes/sun/security/jgss/HttpCaller.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/jgss/HttpCaller.java	Tue Aug 12 19:52:31 2014 -0300
@@ -43,4 +43,3 @@
         return hci;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/jgss/spnego/SpNegoContext.java
--- a/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java	Tue Aug 12 19:52:31 2014 -0300
@@ -1231,4 +1231,3 @@
         }
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/krb5/KdcComm.java
--- a/src/share/classes/sun/security/krb5/KdcComm.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/krb5/KdcComm.java	Tue Aug 12 19:52:31 2014 -0300
@@ -560,4 +560,3 @@
         }
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
--- a/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Tue Aug 12 19:52:31 2014 -0300
@@ -640,8 +640,7 @@
 
         for (int i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
--- a/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Tue Aug 12 19:52:31 2014 -0300
@@ -158,8 +158,8 @@
         }
         sb.append(hexDumper.encode(certHash));
         if (issuer != null && serialNumber != null) {
-            sb.append("\n\tIssuer: " + issuer + "\n");
-            sb.append("\t" + serialNumber);
+            sb.append("\n\tIssuer: ").append(issuer).append('\n');
+            sb.append('\t').append(serialNumber);
         }
         sb.append("\n]");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs11/P11KeyStore.java
--- a/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Tue Aug 12 19:52:31 2014 -0300
@@ -196,24 +196,24 @@
             } else if (type == ATTR_CLASS_CERT) {
                 sb.append("\ttype=[trusted cert]\n");
             }
-            sb.append("\tlabel=[" + label + "]\n");
+            sb.append("\tlabel=[").append(label).append("]\n");
             if (id == null) {
                 sb.append("\tid=[null]\n");
             } else {
-                sb.append("\tid=" + P11KeyStore.getID(id) + "\n");
+                sb.append("\tid=").append(P11KeyStore.getID(id)).append('\n');
             }
-            sb.append("\ttrusted=[" + trusted + "]\n");
-            sb.append("\tmatched=[" + matched + "]\n");
+            sb.append("\ttrusted=[").append(trusted).append("]\n");
+            sb.append("\tmatched=[").append(matched).append("]\n");
             if (cert == null) {
                 sb.append("\tcert=[null]\n");
             } else {
-                sb.append("\tcert=[\tsubject: " +
-                        cert.getSubjectX500Principal() +
-                        "\n\t\tissuer: " +
-                        cert.getIssuerX500Principal() +
-                        "\n\t\tserialNum: " +
-                        cert.getSerialNumber().toString() +
-                        "]");
+                sb.append("\tcert=[\tsubject: ")
+                        .append(cert.getSubjectX500Principal())
+                        .append("\n\t\tissuer: ")
+                        .append(cert.getIssuerX500Principal())
+                        .append("\n\t\tserialNum: ")
+                        .append(cert.getSerialNumber().toString())
+                        .append(']');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/PolicyFile.java
--- a/src/share/classes/sun/security/provider/PolicyFile.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/PolicyFile.java	Tue Aug 12 19:52:31 2014 -0300
@@ -1485,30 +1485,30 @@
         }
         int startIndex = 0;
         int v;
-        StringBuilder sb = new StringBuilder();
-        while ((v = sp.getSelfName().indexOf(SELF, startIndex)) != -1) {
+                StringBuilder sb = new StringBuilder();
+                while ((v = sp.getSelfName().indexOf(SELF, startIndex)) != -1) {
 
-            // add non-SELF string
-            sb.append(sp.getSelfName().substring(startIndex, v));
+                        // add non-SELF string
+                        sb.append(sp.getSelfName().substring(startIndex, v));
 
-            // expand SELF
-            Iterator<PolicyParser.PrincipalEntry> pli = entryPs.iterator();
-            while (pli.hasNext()) {
-                PolicyParser.PrincipalEntry pppe = pli.next();
-                String[][] principalInfo = getPrincipalInfo(pppe,pdp);
-                for (int i = 0; i < principalInfo.length; i++) {
-                    if (i != 0) {
-                        sb.append(", ");
-                    }
-                    sb.append(principalInfo[i][0] + " " +
-                        "\"" + principalInfo[i][1] + "\"");
+                        // expand SELF
+                        Iterator<PolicyParser.PrincipalEntry> pli = entryPs.iterator();
+                        while (pli.hasNext()) {
+                                PolicyParser.PrincipalEntry pppe = pli.next();
+                                String[][] principalInfo = getPrincipalInfo(pppe, pdp);
+                                for (int i = 0; i < principalInfo.length; i++) {
+                                        if (i != 0) {
+                                                sb.append(", ");
+                                        }
+                                        sb.append(principalInfo[i][0]).append(' ').append('"')
+                                                        .append(principalInfo[i][1]).append('"');
+                                }
+                                if (pli.hasNext()) {
+                                        sb.append(", ");
+                                }
+                        }
+                        startIndex = v + SELF.length();
                 }
-                if (pli.hasNext()) {
-                    sb.append(", ");
-                }
-            }
-            startIndex = v + SELF.length();
-        }
         // add remaining string (might be the entire string)
         sb.append(sp.getSelfName().substring(startIndex));
 
@@ -1774,17 +1774,17 @@
         Principal[] principals = pd.getPrincipals();
         String pals = "<no principals>";
         if (principals != null && principals.length > 0) {
-            StringBuilder palBuf = new StringBuilder("(principals ");
+            StringBuilder palSB = new StringBuilder("(principals ");
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                              " \"" + principals[i].getName() +
-                              "\"");
+                palSB.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append('"');
                 if (i < principals.length-1)
-                    palBuf.append(", ");
+                    palSB.append(", ");
                 else
-                    palBuf.append(")");
+                    palSB.append(')');
             }
-            pals = palBuf.toString();
+            pals = palSB.toString();
         }
         return "PD CodeSource: "
                 + pd.getCodeSource()
@@ -1884,7 +1884,7 @@
                     throw new Exception(form.format(source));
                 }
 
-                sb.append(X500PRINCIPAL + " \"" + suffix + "\"");
+                sb.append(X500PRINCIPAL).append(" \"").append(suffix).append('"');
                 startIndex = e+2;
             } else {
                 MessageFormat form = new MessageFormat
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
--- a/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java	Tue Aug 12 19:52:31 2014 -0300
@@ -363,4 +363,3 @@
     }
 
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/CertId.java
--- a/src/share/classes/sun/security/provider/certpath/CertId.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/CertId.java	Tue Aug 12 19:52:31 2014 -0300
@@ -223,13 +223,13 @@
     @Override public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CertId \n");
-        sb.append("Algorithm: " + hashAlgId.toString() +"\n");
+        sb.append("Algorithm: ").append(hashAlgId.toString()).append('\n');
         sb.append("issuerNameHash \n");
         HexDumpEncoder encoder = new HexDumpEncoder();
         sb.append(encoder.encode(issuerNameHash));
         sb.append("\nissuerKeyHash: \n");
         sb.append(encoder.encode(issuerKeyHash));
-        sb.append("\n" +  certSerialNumber.toString());
+        sb.append('\n').append(certSerialNumber.toString());
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/OCSPResponse.java
--- a/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Aug 12 19:52:31 2014 -0300
@@ -812,14 +812,14 @@
             StringBuilder sb = new StringBuilder();
             sb.append("SingleResponse:  \n");
             sb.append(certId);
-            sb.append("\nCertStatus: "+ certStatus + "\n");
+            sb.append("\nCertStatus: ").append(certStatus).append('\n');
             if (certStatus == CertStatus.REVOKED) {
-                sb.append("revocationTime is " + revocationTime + "\n");
-                sb.append("revocationReason is " + revocationReason + "\n");
+                sb.append("revocationTime is ").append(revocationTime).append('\n');
+                sb.append("revocationReason is ").append(revocationReason).append('\n');
             }
-            sb.append("thisUpdate is " + thisUpdate + "\n");
+            sb.append("thisUpdate is ").append(thisUpdate).append('\n');
             if (nextUpdate != null) {
-                sb.append("nextUpdate is " + nextUpdate + "\n");
+                sb.append("nextUpdate is ").append(nextUpdate).append('\n');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
--- a/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Tue Aug 12 19:52:31 2014 -0300
@@ -124,7 +124,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Build Forward Flag: " + String.valueOf(buildForward) + "\n");
+        sb.append("  Build Forward Flag: ").append(String.valueOf(buildForward)).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/UntrustedChecker.java
--- a/src/share/classes/sun/security/provider/certpath/UntrustedChecker.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/UntrustedChecker.java	Tue Aug 12 19:52:31 2014 -0300
@@ -86,4 +86,3 @@
         }
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/HandshakeMessage.java
--- a/src/share/classes/sun/security/ssl/HandshakeMessage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/HandshakeMessage.java	Tue Aug 12 19:52:31 2014 -0300
@@ -1478,7 +1478,7 @@
                 boolean opened = false;
                 for (SignatureAndHashAlgorithm signAlg : algorithms) {
                     if (opened) {
-                        sb.append(", " + signAlg.getAlgorithmName());
+                        sb.append(", ").append(signAlg.getAlgorithmName());
                     } else {
                         sb.append(signAlg.getAlgorithmName());
                         opened = true;
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/MAC.java
--- a/src/share/classes/sun/security/ssl/MAC.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/MAC.java	Tue Aug 12 19:52:31 2014 -0300
@@ -165,4 +165,3 @@
     }
 
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
--- a/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java	Tue Aug 12 19:52:31 2014 -0300
@@ -472,4 +472,3 @@
         }
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/ServerNameExtension.java
--- a/src/share/classes/sun/security/ssl/ServerNameExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/ServerNameExtension.java	Tue Aug 12 19:52:31 2014 -0300
@@ -267,11 +267,11 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
+        sb.append("Extension ").append(type).append(", server_name: ");
         for (SNIServerName sniName : sniMap.values()) {
-            sb.append("[" + sniName + "]");
+            sb.append('[').append(sniName).append(']');
         }
-
-        return "Extension " + type + ", server_name: " + sb;
+        return sb.toString();
     }
 
     private static class UnknownServerName extends SNIServerName {
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
--- a/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Tue Aug 12 19:52:31 2014 -0300
@@ -119,17 +119,16 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
+        sb.append("Extension ").append(type).append(", signature_algorithms: ");
         boolean opened = false;
         for (SignatureAndHashAlgorithm signAlg : algorithms) {
             if (opened) {
-                sb.append(", " + signAlg.getAlgorithmName());
+                sb.append(", ").append(signAlg.getAlgorithmName());
             } else {
                 sb.append(signAlg.getAlgorithmName());
                 opened = true;
             }
         }
-
-        return "Extension " + type + ", signature_algorithms: " + sb;
+        return  sb.toString();
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
--- a/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java	Tue Aug 12 19:52:31 2014 -0300
@@ -434,4 +434,3 @@
         }
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
--- a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Aug 12 19:52:31 2014 -0300
@@ -112,37 +112,37 @@
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Extension " + type + ", curve names: {");
-        boolean first = true;
-        for (int curveId : curveIds) {
-            if (first) {
-                first = false;
-            } else {
-                sb.append(", ");
-            }
-            // first check if it is a known named curve, then try other cases.
-            String oid = getCurveOid(curveId);
-            if (oid != null) {
-                ECParameterSpec spec = JsseJce.getECParameterSpec(oid);
-                // this toString() output will look nice for the current
-                // implementation of the ECParameterSpec class in the Sun
-                // provider, but may not look good for other implementations.
-                if (spec != null) {
-                    sb.append(spec.toString().split(" ")[0]);
-                } else {
-                    sb.append(oid);
+                StringBuilder sb = new StringBuilder();
+                sb.append("Extension ").append(type).append(", curve names: {");
+                boolean first = true;
+                for (int curveId : curveIds) {
+                        if (first) {
+                                first = false;
+                        } else {
+                                sb.append(", ");
+                        }
+                        // first check if it is a known named curve, then try other cases.
+                        String oid = getCurveOid(curveId);
+                        if (oid != null) {
+                                ECParameterSpec spec = JsseJce.getECParameterSpec(oid);
+                                // this toString() output will look nice for the current
+                                // implementation of the ECParameterSpec class in the Sun
+                                // provider, but may not look good for other implementations.
+                                if (spec != null) {
+                                        sb.append(spec.toString().split(" ")[0]);
+                                } else {
+                                        sb.append(oid);
+                                }
+                        } else if (curveId == ARBITRARY_PRIME) {
+                                sb.append("arbitrary_explicit_prime_curves");
+                        } else if (curveId == ARBITRARY_CHAR2) {
+                                sb.append("arbitrary_explicit_char2_curves");
+                        } else {
+                                sb.append("unknown curve ").append(curveId);
+                        }
                 }
-            } else if (curveId == ARBITRARY_PRIME) {
-                sb.append("arbitrary_explicit_prime_curves");
-            } else if (curveId == ARBITRARY_CHAR2) {
-                sb.append("arbitrary_explicit_char2_curves");
-            } else {
-                sb.append("unknown curve " + curveId);
-            }
-        }
-        sb.append("}");
-        return sb.toString();
+                sb.append("}");
+                return sb.toString();
     }
 
     // Test whether we support the curve with the given index.
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/jarsigner/Main.java
--- a/src/share/classes/sun/security/tools/jarsigner/Main.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/jarsigner/Main.java	Tue Aug 12 19:52:31 2014 -0300
@@ -676,14 +676,13 @@
                             ((man.getAttributes(name) != null) ||
                              (man.getAttributes("./"+name) != null) ||
                              (man.getAttributes("/"+name) != null));
-                        sb.append(
-                          (isSigned ? rb.getString("s") : rb.getString("SPACE")) +
-                          (inManifest ? rb.getString("m") : rb.getString("SPACE")) +
-                          (inStore ? rb.getString("k") : rb.getString("SPACE")) +
-                          (inScope ? rb.getString("i") : rb.getString("SPACE")) +
-                          ((inStoreOrScope & NOT_ALIAS) != 0 ?"X":" ") +
-                          rb.getString("SPACE"));
-                        sb.append("|");
+                        sb.append(isSigned ? rb.getString("s") : rb.getString("SPACE"))
+                                .append(inManifest ? rb.getString("m") : rb.getString("SPACE"))
+                                .append(inStore ? rb.getString("k") : rb.getString("SPACE"))
+                                .append(inScope ? rb.getString("i") : rb.getString("SPACE"))
+                                .append((inStoreOrScope & NOT_ALIAS) != 0 ? 'X' : ' ')
+                                .append(rb.getString("SPACE"));
+                        sb.append('|');
                     }
 
                     // When -certs provided, display info has extra empty
@@ -704,11 +703,13 @@
                         // Print no info for unsigned entries when -verbose:all,
                         // to be consistent with old behavior.
                         if (signatureRelated(name)) {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Signature.related.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(
+                                        rb.getString(".Signature.related.entries."))
+                                        .append("\n\n");
                         } else {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Unsigned.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(
+                                        rb.getString(".Unsigned.entries."))
+                                        .append("\n\n");
                         }
                     }
 
@@ -1605,8 +1606,8 @@
                 // No more warning, we alreay have hasExpiredCert or notYetValidCert
             } else {
                 chainNotValidated = true;
-                sb.append(tab + rb.getString(".CertPath.not.validated.") +
-                        e.getLocalizedMessage() + "]\n");   // TODO
+                sb.append(tab).append(rb.getString(".CertPath.not.validated."))
+                        .append(e.getLocalizedMessage()).append("]\n");   // TODO
             }
         }
         String result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/keytool/Main.java
--- a/src/share/classes/sun/security/tools/keytool/Main.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/keytool/Main.java	Tue Aug 12 19:52:31 2014 -0300
@@ -4234,4 +4234,3 @@
         return new Pair<>(a,b);
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/policytool/PolicyTool.java
--- a/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Tue Aug 12 19:52:31 2014 -0300
@@ -980,8 +980,9 @@
                                 grantEntry.principals.listIterator();
             while (list.hasNext()) {
                 PolicyParser.PrincipalEntry pppe = list.next();
-                sb.append(" Principal " + pppe.getDisplayClass() + " " +
-                    pppe.getDisplayName(true));
+                sb.append(" Principal ").append(pppe.getDisplayClass())
+                        .append(' ')
+                        .append(pppe.getDisplayName(true));
                 if (list.hasNext()) sb.append(", ");
             }
             result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
--- a/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	Tue Aug 12 19:52:31 2014 -0300
@@ -455,4 +455,3 @@
     }
 
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/ECParameters.java
--- a/src/share/classes/sun/security/util/ECParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/ECParameters.java	Tue Aug 12 19:52:31 2014 -0300
@@ -233,4 +233,3 @@
         return namedCurve.toString();
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/KeyUtil.java
--- a/src/share/classes/sun/security/util/KeyUtil.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/KeyUtil.java	Tue Aug 12 19:52:31 2014 -0300
@@ -303,4 +303,3 @@
     }
 
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/Resources.java
--- a/src/share/classes/sun/security/util/Resources.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/Resources.java	Tue Aug 12 19:52:31 2014 -0300
@@ -169,4 +169,3 @@
         return contents;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/Resources_de.java
--- a/src/share/classes/sun/security/util/Resources_de.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/Resources_de.java	Tue Aug 12 19:52:31 2014 -0300
@@ -169,4 +169,3 @@
         return contents;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/Resources_es.java
--- a/src/share/classes/sun/security/util/Resources_es.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/Resources_es.java	Tue Aug 12 19:52:31 2014 -0300
@@ -169,4 +169,3 @@
         return contents;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/Resources_fr.java
--- a/src/share/classes/sun/security/util/Resources_fr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/Resources_fr.java	Tue Aug 12 19:52:31 2014 -0300
@@ -169,4 +169,3 @@
         return contents;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/Resources_it.java
--- a/src/share/classes/sun/security/util/Resources_it.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/Resources_it.java	Tue Aug 12 19:52:31 2014 -0300
@@ -169,4 +169,3 @@
         return contents;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/Resources_ja.java
--- a/src/share/classes/sun/security/util/Resources_ja.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/Resources_ja.java	Tue Aug 12 19:52:31 2014 -0300
@@ -169,4 +169,3 @@
         return contents;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/Resources_ko.java
--- a/src/share/classes/sun/security/util/Resources_ko.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/Resources_ko.java	Tue Aug 12 19:52:31 2014 -0300
@@ -169,4 +169,3 @@
         return contents;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/Resources_pt_BR.java
--- a/src/share/classes/sun/security/util/Resources_pt_BR.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/Resources_pt_BR.java	Tue Aug 12 19:52:31 2014 -0300
@@ -169,4 +169,3 @@
         return contents;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/Resources_sv.java
--- a/src/share/classes/sun/security/util/Resources_sv.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/Resources_sv.java	Tue Aug 12 19:52:31 2014 -0300
@@ -169,4 +169,3 @@
         return contents;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/Resources_zh_CN.java
--- a/src/share/classes/sun/security/util/Resources_zh_CN.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/Resources_zh_CN.java	Tue Aug 12 19:52:31 2014 -0300
@@ -169,4 +169,3 @@
         return contents;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/util/Resources_zh_TW.java
--- a/src/share/classes/sun/security/util/Resources_zh_TW.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/util/Resources_zh_TW.java	Tue Aug 12 19:52:31 2014 -0300
@@ -169,4 +169,3 @@
         return contents;
     }
 }
-
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/AVA.java
--- a/src/share/classes/sun/security/x509/AVA.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/AVA.java	Tue Aug 12 19:52:31 2014 -0300
@@ -1062,7 +1062,7 @@
             } else {
 
                 boolean quoteNeeded = false;
-                StringBuilder sbuffer = new StringBuilder();
+                StringBuilder sb = new StringBuilder();
                 boolean previousWhite = false;
                 final String escapees = ",+=\n<>#;\\\"";
 
@@ -1079,7 +1079,7 @@
                 for (int i = 0; i < length; i++) {
                     char c = valStr.charAt(i);
                     if (alreadyQuoted && (i == 0 || i == length - 1)) {
-                        sbuffer.append(c);
+                        sb.append(c);
                         continue;
                     }
                     if (DerValue.isPrintableStringChar(c) ||
@@ -1096,7 +1096,7 @@
                         if (!(c == ' ' || c == '\n')) {
                             // escape '"' and '\'
                             if (c == '"' || c == '\\') {
-                                sbuffer.append('\\');
+                                sb.append('\\');
                             }
                             previousWhite = false;
                         } else {
@@ -1106,7 +1106,7 @@
                             previousWhite = true;
                         }
 
-                        sbuffer.append(c);
+                        sb.append(c);
 
                     } else if (debug != null && Debug.isOn("ava")) {
 
@@ -1119,26 +1119,26 @@
                         byte[] valueBytes =
                                 Character.toString(c).getBytes("UTF8");
                         for (int j = 0; j < valueBytes.length; j++) {
-                            sbuffer.append('\\');
+                            sb.append('\\');
                             char hexChar = Character.forDigit
                                         (0xF & (valueBytes[j] >>> 4), 16);
-                            sbuffer.append(Character.toUpperCase(hexChar));
+                            sb.append(Character.toUpperCase(hexChar));
                             hexChar = Character.forDigit
                                         (0xF & (valueBytes[j]), 16);
-                            sbuffer.append(Character.toUpperCase(hexChar));
+                            sb.append(Character.toUpperCase(hexChar));
                         }
                     } else {
 
                         // append non-printable/non-escaped char
 
                         previousWhite = false;
-                        sbuffer.append(c);
+                        sb.append(c);
                     }
                 }
 
                 // quote if trailing whitespace
-                if (sbuffer.length() > 0) {
-                    char trailChar = sbuffer.charAt(sbuffer.length() - 1);
+                if (sb.length() > 0) {
+                    char trailChar = sb.charAt(sb.length() - 1);
                     if (trailChar == ' ' || trailChar == '\n') {
                         quoteNeeded = true;
                     }
@@ -1147,9 +1147,9 @@
                 // Emit the string ... quote it if needed
                 // if string is already quoted, don't re-quote
                 if (!alreadyQuoted && quoteNeeded) {
-                    retval.append("\"" + sbuffer.toString() + "\"");
+                    retval.append('"').append(sb.toString()).append('"');
                 } else {
-                    retval.append(sbuffer.toString());
+                    retval.append(sb.toString());
                 }
             }
         } catch (IOException e) {
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPoint.java
--- a/src/share/classes/sun/security/x509/DistributionPoint.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPoint.java	Tue Aug 12 19:52:31 2014 -0300
@@ -381,22 +381,22 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPoint:\n     " + fullName + "\n");
+            sb.append("DistributionPoint:\n     ").append(fullName).append('\n');
         }
         if (relativeName != null) {
-            sb.append("DistributionPoint:\n     " + relativeName + "\n");
+            sb.append("DistributionPoint:\n     ").append(relativeName).append('\n');
         }
 
         if (reasonFlags != null) {
             sb.append("   ReasonFlags:\n");
             for (int i = 0; i < reasonFlags.length; i++) {
                 if (reasonFlags[i]) {
-                    sb.append("    " + reasonToString(i) + "\n");
+                    sb.append("    ").append(reasonToString(i)).append('\n');
                 }
             }
         }
         if (crlIssuer != null) {
-            sb.append("   CRLIssuer:" + crlIssuer + "\n");
+            sb.append("   CRLIssuer:").append(crlIssuer).append('\n');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPointName.java
--- a/src/share/classes/sun/security/x509/DistributionPointName.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPointName.java	Tue Aug 12 19:52:31 2014 -0300
@@ -231,10 +231,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPointName:\n     " + fullName + "\n");
+            sb.append("DistributionPointName:\n     ").append(fullName).append('\n');
 
         } else {
-            sb.append("DistributionPointName:\n     " + relativeName + "\n");
+            sb.append("DistributionPointName:\n     ").append(relativeName).append('\n');
         }
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/PolicyInformation.java
--- a/src/share/classes/sun/security/x509/PolicyInformation.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/PolicyInformation.java	Tue Aug 12 19:52:31 2014 -0300
@@ -258,9 +258,9 @@
      * Return a printable representation of the PolicyInformation.
      */
     public String toString() {
-        StringBuilder s = new StringBuilder("  [" + policyIdentifier.toString());
-        s.append(policyQualifiers + "  ]\n");
-        return s.toString();
+        StringBuilder sb = new StringBuilder("  [" + policyIdentifier.toString());
+        sb.append(policyQualifiers).append("  ]\n");
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLEntryImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Tue Aug 12 19:52:31 2014 -0300
@@ -292,17 +292,17 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append(serialNumber.toString());
-        sb.append("  On: " + revocationDate.toString());
+        sb.append("  On: ").append(revocationDate.toString());
         if (certIssuer != null) {
-            sb.append("\n    Certificate issuer: " + certIssuer);
+            sb.append("\n    Certificate issuer: ").append(certIssuer);
         }
         if (extensions != null) {
             Collection<Extension> allEntryExts = extensions.getAllExtensions();
             Extension[] exts = allEntryExts.toArray(new Extension[0]);
 
-            sb.append("\n    CRL Entry Extensions: " + exts.length);
+            sb.append("\n    CRL Entry Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n    [" + (i+1) + "]: ");
+                sb.append("\n    [").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -313,9 +313,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLImpl.java	Tue Aug 12 19:52:31 2014 -0300
@@ -537,31 +537,32 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("X.509 CRL v" + (version+1) + "\n");
+        sb.append("X.509 CRL v").append(version + 1).append('\n');
         if (sigAlgId != null)
-            sb.append("Signature Algorithm: " + sigAlgId.toString() +
-                  ", OID=" + (sigAlgId.getOID()).toString() + "\n");
+            sb.append("Signature Algorithm: ").append(sigAlgId.toString())
+                    .append(", OID=")
+                    .append((sigAlgId.getOID()).toString()).append('\n');
         if (issuer != null)
-            sb.append("Issuer: " + issuer.toString() + "\n");
+            sb.append("Issuer: ").append(issuer.toString()).append('\n');
         if (thisUpdate != null)
-            sb.append("\nThis Update: " + thisUpdate.toString() + "\n");
+            sb.append("\nThis Update: ").append(thisUpdate.toString()).append('\n');
         if (nextUpdate != null)
-            sb.append("Next Update: " + nextUpdate.toString() + "\n");
+            sb.append("Next Update: ").append(nextUpdate.toString()).append('\n');
         if (revokedList.isEmpty())
             sb.append("\nNO certificates have been revoked\n");
         else {
-            sb.append("\nRevoked Certificates: " + revokedList.size());
+            sb.append("\nRevoked Certificates: ").append(revokedList.size());
             int i = 1;
             for (X509CRLEntry entry: revokedList) {
-                sb.append("\n[" + i++ + "] " + entry.toString());
+                sb.append("\n[").append(i++).append("] ").append(entry.toString());
             }
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Object[] objs = allExts.toArray();
-            sb.append("\nCRL Extensions: " + objs.length);
+            sb.append("\nCRL Extensions: ").append(objs.length);
             for (int i = 0; i < objs.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = (Extension)objs[i];
                 try {
                    if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -572,9 +573,8 @@
                            out.putOctetString(extValue);
                            extValue = out.toByteArray();
                            HexDumpEncoder enc = new HexDumpEncoder();
-                           sb.append("Extension unknown: "
-                                     + "DER encoded OCTET string =\n"
-                                     + enc.encodeBuffer(extValue) + "\n");
+                           sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                   .append(enc.encodeBuffer(extValue)).append('\n');
                       }
                    } else
                        sb.append(ext.toString()); // sub-class exists
@@ -585,8 +585,7 @@
         }
         if (signature != null) {
             HexDumpEncoder encoder = new HexDumpEncoder();
-            sb.append("\nSignature:\n" + encoder.encodeBuffer(signature)
-                      + "\n");
+            sb.append("\nSignature:\n").append(encoder.encodeBuffer(signature)).append('\n');
         } else
             sb.append("NOT signed yet\n");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertImpl.java
--- a/src/share/classes/sun/security/x509/X509CertImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertImpl.java	Tue Aug 12 19:52:31 2014 -0300
@@ -802,11 +802,11 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append(info.toString() + "\n");
-        sb.append("  Algorithm: [" + algId.toString() + "]\n");
+        sb.append(info.toString()).append('\n');
+        sb.append("  Algorithm: [").append(algId.toString()).append("]\n");
 
         HexDumpEncoder encoder = new HexDumpEncoder();
-        sb.append("  Signature:\n" + encoder.encodeBuffer(signature));
+        sb.append("  Signature:\n").append(encoder.encodeBuffer(signature));
         sb.append("\n]");
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertInfo.java
--- a/src/share/classes/sun/security/x509/X509CertInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertInfo.java	Tue Aug 12 19:52:31 2014 -0300
@@ -298,27 +298,27 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append("  " + version.toString() + "\n");
-        sb.append("  Subject: " + subject.toString() + "\n");
-        sb.append("  Signature Algorithm: " + algId.toString() + "\n");
-        sb.append("  Key:  " + pubKey.toString() + "\n");
-        sb.append("  " + interval.toString() + "\n");
-        sb.append("  Issuer: " + issuer.toString() + "\n");
-        sb.append("  " + serialNum.toString() + "\n");
+        sb.append("  ").append(version.toString()).append('\n');
+        sb.append("  Subject: ").append(subject.toString()).append('\n');
+        sb.append("  Signature Algorithm: ").append(algId.toString()).append('\n');
+        sb.append("  Key:  ").append(pubKey.toString()).append('\n');
+        sb.append("  ").append(interval.toString()).append('\n');
+        sb.append("  Issuer: ").append(issuer.toString()).append('\n');
+        sb.append("  ").append(serialNum.toString()).append('\n');
 
         // optional v2, v3 extras
         if (issuerUniqueId != null) {
-            sb.append("  Issuer Id:\n" + issuerUniqueId.toString() + "\n");
+            sb.append("  Issuer Id:\n").append(issuerUniqueId.toString()).append('\n');
         }
         if (subjectUniqueId != null) {
-            sb.append("  Subject Id:\n" + subjectUniqueId.toString() + "\n");
+            sb.append("  Subject Id:\n").append(subjectUniqueId.toString()).append('\n');
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Extension[] exts = allExts.toArray(new Extension[0]);
-            sb.append("\nCertificate Extensions: " + exts.length);
+            sb.append("\nCertificate Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -329,9 +329,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
@@ -341,10 +340,10 @@
             }
             Map<String,Extension> invalid = extensions.getUnparseableExtensions();
             if (invalid.isEmpty() == false) {
-                sb.append("\nUnparseable certificate extensions: " + invalid.size());
+                sb.append("\nUnparseable certificate extensions: ").append(invalid.size());
                 int i = 1;
                 for (Extension ext : invalid.values()) {
-                    sb.append("\n[" + (i++) + "]: ");
+                    sb.append("\n[").append(i++).append("]: ");
                     sb.append(ext);
                 }
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/ThreadTab.java
--- a/src/share/classes/sun/tools/jconsole/ThreadTab.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/ThreadTab.java	Tue Aug 12 19:52:31 2014 -0300
@@ -368,7 +368,7 @@
                             sb.append(Messages.STACK_TRACE);
                             int index = 0;
                             for (StackTraceElement e : ti.getStackTrace()) {
-                                sb.append(e.toString()+"\n");
+                                sb.append(e.toString()).append('\n');
                                 if (monitors != null) {
                                     for (MonitorInfo mi : monitors) {
                                         if (mi.getLockedStackDepth() == index) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Tue Aug 12 19:52:31 2014 -0300
@@ -79,25 +79,25 @@
             String textColor = String.format("%06x",
                                              foreground.getRGB() & 0xFFFFFF);
             StringBuilder sb = new StringBuilder();
-            sb.append("<html><body text=#"+textColor+"><table width=\"100%\">");
+            sb.append("<html><body text=#").append(textColor).append("><table width=\"100%\">");
             for (int i = 0; i < arr.length; i++) {
                 if (i % 2 == 0) {
-                    sb.append("<tr style=\"background-color: " +
-                            evenRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(evenRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 } else {
-                    sb.append("<tr style=\"background-color: " +
-                            oddRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(oddRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 }
             }
             if (arr.length == 0) {
-                sb.append("<tr style=\"background-color: " +
-                        evenRowColorStr + "\"><td></td></tr>");
+                                sb.append("<tr style=\"background-color: ")
+                                                .append(evenRowColorStr).append("\"><td></td></tr>");
             }
             sb.append("</table></body></html>");
             arrayEditor.setText(sb.toString());
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XTree.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Tue Aug 12 19:52:31 2014 -0300
@@ -507,13 +507,13 @@
         // key order defined by the "orderedKeyPropertyList"
         for (String key : orderedKeyPropertyList) {
             if (map.containsKey(key)) {
-                sb.append(key + "=" + map.get(key) + ",");
+                sb.append(key).append('=').append(map.get(key)).append(',');
                 map.remove(key);
             }
         }
         // Add the remaining key/value pairs to the buffer
         for (Map.Entry<String, String> entry : map.entrySet()) {
-            sb.append(entry.getKey() + "=" + entry.getValue() + ",");
+            sb.append(entry.getKey()).append('=').append(entry.getValue()).append(',');
         }
         String orderedKeyPropertyListString = sb.toString();
         orderedKeyPropertyListString = orderedKeyPropertyListString.substring(
@@ -622,7 +622,7 @@
                     //
                     StringBuilder sb = new StringBuilder();
                     for (MBeanParameterInfo mbpi : mboi.getSignature()) {
-                        sb.append(mbpi.getType() + ",");
+                        sb.append(mbpi.getType()).append(',');
                     }
                     String signature = sb.toString();
                     if (signature.length() > 0) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jps/Jps.java
--- a/src/share/classes/sun/tools/jps/Jps.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jps/Jps.java	Tue Aug 12 19:52:31 2014 -0300
@@ -92,28 +92,28 @@
                     vm = monitoredHost.getMonitoredVm(id, 0);
 
                     errorString = " -- main class information unavailable";
-                    output.append(" " + MonitoredVmUtil.mainClass(vm,
+                    output.append(' ').append(MonitoredVmUtil.mainClass(vm,
                             arguments.showLongPaths()));
 
                     if (arguments.showMainArgs()) {
                         errorString = " -- main args information unavailable";
                         String mainArgs = MonitoredVmUtil.mainArgs(vm);
                         if (mainArgs != null && mainArgs.length() > 0) {
-                            output.append(" " + mainArgs);
+                            output.append(' ').append(mainArgs);
                         }
                     }
                     if (arguments.showVmArgs()) {
                         errorString = " -- jvm args information unavailable";
                         String jvmArgs = MonitoredVmUtil.jvmArgs(vm);
                         if (jvmArgs != null && jvmArgs.length() > 0) {
-                          output.append(" " + jvmArgs);
+                          output.append(' ').append(jvmArgs);
                         }
                     }
                     if (arguments.showVmFlags()) {
                         errorString = " -- jvm flags information unavailable";
                         String jvmFlags = MonitoredVmUtil.jvmFlags(vm);
                         if (jvmFlags != null && jvmFlags.length() > 0) {
-                            output.append(" " + jvmFlags);
+                            output.append(' ').append(jvmFlags);
                         }
                     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/RawOutputFormatter.java
--- a/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Tue Aug 12 19:52:31 2014 -0300
@@ -50,7 +50,7 @@
             StringBuilder headerBuilder = new StringBuilder();
             for (Iterator<Monitor> i = logged.iterator(); i.hasNext(); /* empty */ ) {
                 Monitor m = i.next();
-                headerBuilder.append(m.getName() + " ");
+                headerBuilder.append(m.getName()).append(' ');
             }
             header = headerBuilder.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/SyntaxException.java
--- a/src/share/classes/sun/tools/jstat/SyntaxException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/SyntaxException.java	Tue Aug 12 19:52:31 2014 -0300
@@ -65,7 +65,7 @@
     public SyntaxException(int lineno, Set<String> expected, Token found) {
         StringBuilder msg = new StringBuilder();
 
-        msg.append("Syntax error at line " + lineno + ": Expected one of \'");
+        msg.append("Syntax error at line ").append(lineno).append(": Expected one of \'");
 
         boolean first = true;
         for (Iterator<String> i = expected.iterator(); i.hasNext(); /* empty */) {
@@ -74,11 +74,11 @@
                 msg.append(keyWord);
                 first = false;
             } else {
-                msg.append("|" + keyWord);
+                msg.append('|').append(keyWord);
             }
         }
 
-        msg.append("\', Found " + found.toMessage());
+        msg.append("\', Found ").append(found.toMessage());
         message = msg.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/Token.java
--- a/src/share/classes/sun/tools/jstat/Token.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/Token.java	Tue Aug 12 19:52:31 2014 -0300
@@ -89,18 +89,18 @@
             sb.append("ttype=TT_EOF");
             break;
         case StreamTokenizer.TT_NUMBER:
-            sb.append("ttype=TT_NUM,").append("nval="+nval);
+            sb.append("ttype=TT_NUM,").append("nval=").append(nval);
             break;
         case StreamTokenizer.TT_WORD:
             if (sval == null) {
                 sb.append("ttype=TT_WORD:IDENTIFIER");
             } else {
-                sb.append("ttype=TT_WORD:").append("sval="+sval);
+                sb.append("ttype=TT_WORD:").append("sval=").append(sval);
             }
             break;
         default:
             if (ttype == (int)'"') {
-                sb.append("ttype=TT_STRING:").append("sval="+sval);
+                sb.append("ttype=TT_STRING:").append("sval=").append(sval);
             } else {
                 sb.append("ttype=TT_CHAR:").append((char)ttype);
             }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstatd/RemoteHostImpl.java
--- a/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Tue Aug 12 19:52:31 2014 -0300
@@ -68,7 +68,7 @@
 
         sb.append("local://").append(lvmid).append("@localhost");
         if (mode != null) {
-            sb.append("?mode=" + mode);
+            sb.append("?mode=").append(mode);
         }
 
         String vmidStr = sb.toString();

From anthony.petrov at oracle.com  Wed Aug 13 12:11:00 2014
From: anthony.petrov at oracle.com (Anthony Petrov)
Date: Wed, 13 Aug 2014 16:11:00 +0400
Subject: <Swing Dev> JDK 9 RFR of JDK-8054360: Refine generification of
 javax.swing
In-Reply-To: <53EA9A68.7060404@oracle.com>
References: <53E43407.8090104@oracle.com> <53EA9A68.7060404@oracle.com>
Message-ID: <53EB55D4.80305@oracle.com>

Hi Joe,

The changes look good to me. +1.

--
best regards,
Anthony

On 8/13/2014 2:51 AM, Joe Darcy wrote:
> *ping*
>
> Any other comments here?
>
> Thanks,
>
> -Joe
>
> On 08/07/2014 07:20 PM, Joe Darcy wrote:
>> Hello,
>>
>> Please review my changes for
>>
>>     JDK-8054360: Refine generification of javax.swing h
>> http://cr.openjdk.java.net/~darcy/8054360.3/
>>
>> Full patch below.
>>
>> This resolves many of the source incompatibility exemplars Jan Lahoda
>> found in a corpus of programs using swing.
>>
>> A few comments on the changes.
>>
>> It seems many existing implementations of the TreeNode interface have
>> a covariant override of the old raw
>>
>>     Enumeration children();
>>
>> method which returns an enumeration of the specific TreeNode
>> implementation type. The revised generification of
>>
>>     Enumeration<? extends TreeNode> children();
>>
>> allows those existing implementations to still compile. This is a
>> lower-impact way of allowing those types to still compile compared to
>> trying to add a type variable to TreeNode.
>>
>> After some expert generics advice from Dan Smith, I but together a
>> different generification of
>>
>>     src/share/classes/javax/swing/table/DefaultTableModel.java
>>
>> which has better source compatibility. Quoting from the changes:
>>
>>   73     @SuppressWarnings("rawtypes")
>>   74     protected Vector<Vector>    dataVector;
>>   75
>>   76     /** The <code>Vector</code> of column identifiers. */
>>   77     @SuppressWarnings("rawtypes")
>>   78     protected Vector    columnIdentifiers;
>>   79     // Unfortunately, for greater source compatibility the
>> inner-most
>>   80     // Vector in the two fields above is being left raw. The
>> Vector is
>>   81     // read as well as written so using Vector<?> is not suitable
>> and
>>   82     // using Vector<Object> (without adding copying of input
>> Vectors),
>>   83     // would disallow existing code that used, say, a Vector<String>
>>   84     // as an input parameter.
>>
>> The setter methods used for these fields are changes to have
>> parameters of type Vector<?> and Vector<? extends Vector>, respectively.
>>
>> The type Vector<? extends Vector> is the most general type which
>> captures the implicit constraint of the dataVector field: it is a
>> Vector of other Vectors. (It would probably be possible to update
>> dataVector to the somewhat more general Vector<List>, but that would
>> require changes to the code in other methods of the class.)
>>
>> The changes in
>> src/share/classes/sun/tools/jconsole/inspector/TableSorter.java change
>> the code back to how it was before the swing generification changes
>> went in based on the changes to DefaultTableModel.
>>
>> Once the exact generification is settled, I'll file the internal ccc
>> paperwork.
>>
>> Early feedback on using this revised generification on swing code is
>> welcome!
>>
>> Thanks,
>>
>> -Joe
>>
>


From alexandr.scherbatiy at oracle.com  Thu Aug 14 10:49:12 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Thu, 14 Aug 2014 14:49:12 +0400
Subject: <Swing Dev> JDK 9 RFR of JDK-8054360: Refine generification of
 javax.swing
In-Reply-To: <53EA9A68.7060404@oracle.com>
References: <53E43407.8090104@oracle.com> <53EA9A68.7060404@oracle.com>
Message-ID: <53EC9428.7040806@oracle.com>


  The fix looks good to me.

  Thanks,
  Alexandr.

On 8/13/2014 2:51 AM, Joe Darcy wrote:
> *ping*
>
> Any other comments here?
>
> Thanks,
>
> -Joe
>
> On 08/07/2014 07:20 PM, Joe Darcy wrote:
>> Hello,
>>
>> Please review my changes for
>>
>>     JDK-8054360: Refine generification of javax.swing h
>> http://cr.openjdk.java.net/~darcy/8054360.3/
>>
>> Full patch below.
>>
>> This resolves many of the source incompatibility exemplars Jan Lahoda 
>> found in a corpus of programs using swing.
>>
>> A few comments on the changes.
>>
>> It seems many existing implementations of the TreeNode interface have 
>> a covariant override of the old raw
>>
>>     Enumeration children();
>>
>> method which returns an enumeration of the specific TreeNode 
>> implementation type. The revised generification of
>>
>>     Enumeration<? extends TreeNode> children();
>>
>> allows those existing implementations to still compile. This is a 
>> lower-impact way of allowing those types to still compile compared to 
>> trying to add a type variable to TreeNode.
>>
>> After some expert generics advice from Dan Smith, I but together a 
>> different generification of
>>
>>     src/share/classes/javax/swing/table/DefaultTableModel.java
>>
>> which has better source compatibility. Quoting from the changes:
>>
>>   73     @SuppressWarnings("rawtypes")
>>   74     protected Vector<Vector>    dataVector;
>>   75
>>   76     /** The <code>Vector</code> of column identifiers. */
>>   77     @SuppressWarnings("rawtypes")
>>   78     protected Vector    columnIdentifiers;
>>   79     // Unfortunately, for greater source compatibility the 
>> inner-most
>>   80     // Vector in the two fields above is being left raw. The 
>> Vector is
>>   81     // read as well as written so using Vector<?> is not 
>> suitable and
>>   82     // using Vector<Object> (without adding copying of input 
>> Vectors),
>>   83     // would disallow existing code that used, say, a 
>> Vector<String>
>>   84     // as an input parameter.
>>
>> The setter methods used for these fields are changes to have 
>> parameters of type Vector<?> and Vector<? extends Vector>, respectively.
>>
>> The type Vector<? extends Vector> is the most general type which 
>> captures the implicit constraint of the dataVector field: it is a 
>> Vector of other Vectors. (It would probably be possible to update 
>> dataVector to the somewhat more general Vector<List>, but that would 
>> require changes to the code in other methods of the class.)
>>
>> The changes in 
>> src/share/classes/sun/tools/jconsole/inspector/TableSorter.java 
>> change the code back to how it was before the swing generification 
>> changes went in based on the changes to DefaultTableModel.
>>
>> Once the exact generification is settled, I'll file the internal ccc 
>> paperwork.
>>
>> Early feedback on using this revised generification on swing code is 
>> welcome!
>>
>> Thanks,
>>
>> -Joe
>>
>



From dmitry.markov at oracle.com  Fri Aug 15 06:23:32 2014
From: dmitry.markov at oracle.com (dmitry markov)
Date: Fri, 15 Aug 2014 10:23:32 +0400
Subject: <Swing Dev> [9] Review request for 8048110: Using tables in
 JTextPane leads to infinite loop in FlowLayout.layoutRow
Message-ID: <53EDA764.6090502@oracle.com>

Hello,

Could you review the fix for jdk9, please?

     bug: https://bugs.openjdk.java.net/browse/JDK-8048110
     webrev: http://cr.openjdk.java.net/~dmarkov/8048110/jdk9/webrev.00/

The LogicalView.forwardUpdate() should send an update event to the views 
followed by the changed place, only when an instance of GlyphView has 
changed; otherwise it should invoke View.forwardUpdate() to handle the 
update properly.

Thanks,
Dmitry


From sergey.bylokhov at oracle.com  Fri Aug 15 08:56:12 2014
From: sergey.bylokhov at oracle.com (Sergey Bylokhov)
Date: Fri, 15 Aug 2014 01:56:12 -0700 (PDT)
Subject: <Swing Dev> [9] Review request for 8048110: Using tables in
 JTextPane leads to infinite loop in FlowLayout.layoutRow
Message-ID: <50d74d59-9ebb-4c8b-8e8f-1f4e17bf1074@default>

Hello, Dmitry.
>>The LogicalView.forwardUpdate() should send an update event to the views 
>>followed by the changed place, only when an instance of GlyphView has 
>>changed; otherwise it should invoke View.forwardUpdate() to handle the 
>>update properly.

Can you share additional information about the fix. Why LogicalView should send an update if GlyphView was changed only. Because before the fix LocalView knows nothing about GlyphView.

Thanks,
Dmitry


From otaviojava at java.net  Fri Aug 15 09:41:43 2014
From: otaviojava at java.net (=?UTF-8?Q?Ot=C3=A1vio_Gon=C3=A7alves_de_Santana?=)
Date: Fri, 15 Aug 2014 06:41:43 -0300
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
Message-ID: <CAPc8kR2OdZiPzwOgOyNGv1tzfpwxDpU22O4fP0pTjMQBfK3kjA@mail.gmail.com>

Could anyone help me as sponsor, please?


On Tue, Aug 12, 2014 at 8:01 PM, Ot?vio Gon?alves de Santana <
otaviojava at java.net> wrote:

> Thank you Roger.
> Done
>
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_6.zip
>
>
> On Tue, Aug 12, 2014 at 10:15 AM, roger riggs <roger.riggs at oracle.com>
> wrote:
>
>> fyi,
>>
>> There's a Perl script normalizer.pl that detects/fixes most of the
>> simple tab/white space issues.
>> The script is in the <repo>/make/scripts/normalizer.pl
>>
>> Roger
>>
>>
>> On 8/12/2014 3:48 AM, Andrej Golovnin wrote:
>>
>>> Hi Ot?vio,
>>>
>>> I think you should fix the indentation in a lot of classes. You use the
>>> tab-character for the indentation. As far as I know we should use the
>>> space
>>> character for the indentation in the JDK sources (Oracle devs feel free
>>> to
>>> correct me if I'm wrong. And it would be really nice if the style guide
>>> for
>>> the source code would be a part of the JDK repository. So we don't need
>>> to
>>> search for it on the internet/wiki. Just clone the repository, read the
>>> style guide and follow it. :-) ). Here is the not complete list of
>>> classes
>>> where you used the tab-character for the indentation:
>>>
>>> src/share/classes/com/sun/crypto/provider/OAEPParameters.java
>>> src/share/classes/java/lang/management/MemoryUsage.java
>>> src/share/classes/java/security/KeyStore.java
>>> src/share/classes/java/security/PermissionCollection.java
>>> src/share/classes/java/security/ProtectionDomain.java
>>> src/share/classes/java/security/cert/CertPath.java
>>> src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
>>> src/share/classes/java/security/cert/PKIXParameters.java
>>> src/share/classes/java/security/cert/PolicyQualifierInfo.java
>>> src/share/classes/java/security/cert/TrustAnchor.java
>>> src/share/classes/java/security/cert/X509CertSelector.java
>>> src/share/classes/javax/crypto/CryptoPermission.java
>>> src/share/classes/javax/management/relation/Role.java
>>>
>>>
>>> In src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj in the line 423 a
>>> dot
>>> is missed before append:
>>>
>>> 423   {jjtn000.name.append( '.')append(t.image); }
>>>
>>> Best regards,
>>> Andrej Golovnin
>>>
>>
>>
>
>
> --
> Ot?vio Gon?alves de Santana
>
> blog:     http://otaviosantana.blogspot.com.br/
> twitter: http://twitter.com/otaviojava
> site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
> 55 (11) 98255-3513
>



-- 
Ot?vio Gon?alves de Santana

blog:     http://otaviosantana.blogspot.com.br/
twitter: http://twitter.com/otaviojava
site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
55 (11) 98255-3513
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140815/c035ee57/attachment.html>

From Sergey.Bylokhov at oracle.com  Sat Aug 16 19:38:30 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Sat, 16 Aug 2014 23:38:30 +0400
Subject: <Swing Dev> JDK 9 RFR of JDK-8054360: Refine generification of
 javax.swing
In-Reply-To: <53EA9A68.7060404@oracle.com>
References: <53E43407.8090104@oracle.com> <53EA9A68.7060404@oracle.com>
Message-ID: <53EFB336.7050909@oracle.com>

Hello. Joe.
This change broke the full image build of the client ws.

/repool/java_re/builds/workspace/9-2-build-solaris-sparcv9/jdk9-client/1141/jdk/src/closed/share/demo/jfc/SwingSet2/SliderDemo.java:167: error: incompatible types: JLabel cannot be converted to CAP#1
         s.getLabelTable().put(new Integer(11), new JLabel(new Integer(11).toString(), JLabel.CENTER));
                                                ^
   where CAP#1 is a fresh type-variable:
     CAP#1 extends JComponent from capture of ? extends JComponent


On 13.08.2014 2:51, Joe Darcy wrote:
> *ping*
>
> Any other comments here?
>
> Thanks,
>
> -Joe
>
> On 08/07/2014 07:20 PM, Joe Darcy wrote:
>> Hello,
>>
>> Please review my changes for
>>
>>     JDK-8054360: Refine generification of javax.swing h
>> http://cr.openjdk.java.net/~darcy/8054360.3/
>>
>> Full patch below.
>>
>> This resolves many of the source incompatibility exemplars Jan Lahoda 
>> found in a corpus of programs using swing.
>>
>> A few comments on the changes.
>>
>> It seems many existing implementations of the TreeNode interface have 
>> a covariant override of the old raw
>>
>>     Enumeration children();
>>
>> method which returns an enumeration of the specific TreeNode 
>> implementation type. The revised generification of
>>
>>     Enumeration<? extends TreeNode> children();
>>
>> allows those existing implementations to still compile. This is a 
>> lower-impact way of allowing those types to still compile compared to 
>> trying to add a type variable to TreeNode.
>>
>> After some expert generics advice from Dan Smith, I but together a 
>> different generification of
>>
>>     src/share/classes/javax/swing/table/DefaultTableModel.java
>>
>> which has better source compatibility. Quoting from the changes:
>>
>>   73     @SuppressWarnings("rawtypes")
>>   74     protected Vector<Vector>    dataVector;
>>   75
>>   76     /** The <code>Vector</code> of column identifiers. */
>>   77     @SuppressWarnings("rawtypes")
>>   78     protected Vector    columnIdentifiers;
>>   79     // Unfortunately, for greater source compatibility the 
>> inner-most
>>   80     // Vector in the two fields above is being left raw. The 
>> Vector is
>>   81     // read as well as written so using Vector<?> is not 
>> suitable and
>>   82     // using Vector<Object> (without adding copying of input 
>> Vectors),
>>   83     // would disallow existing code that used, say, a 
>> Vector<String>
>>   84     // as an input parameter.
>>
>> The setter methods used for these fields are changes to have 
>> parameters of type Vector<?> and Vector<? extends Vector>, respectively.
>>
>> The type Vector<? extends Vector> is the most general type which 
>> captures the implicit constraint of the dataVector field: it is a 
>> Vector of other Vectors. (It would probably be possible to update 
>> dataVector to the somewhat more general Vector<List>, but that would 
>> require changes to the code in other methods of the class.)
>>
>> The changes in 
>> src/share/classes/sun/tools/jconsole/inspector/TableSorter.java 
>> change the code back to how it was before the swing generification 
>> changes went in based on the changes to DefaultTableModel.
>>
>> Once the exact generification is settled, I'll file the internal ccc 
>> paperwork.
>>
>> Early feedback on using this revised generification on swing code is 
>> welcome!
>>
>> Thanks,
>>
>> -Joe
>>
>


-- 
Best regards, Sergey.



From joe.darcy at oracle.com  Sat Aug 16 22:22:11 2014
From: joe.darcy at oracle.com (Joe Darcy)
Date: Sat, 16 Aug 2014 15:22:11 -0700
Subject: <Swing Dev> JDK 9 RFR of JDK-8054360: Refine generification of
 javax.swing
In-Reply-To: <53EFB336.7050909@oracle.com>
References: <53E43407.8090104@oracle.com> <53EA9A68.7060404@oracle.com>
	<53EFB336.7050909@oracle.com>
Message-ID: <53EFD993.3070106@oracle.com>

Hi Sergey,

On 08/16/2014 12:38 PM, Sergey Bylokhov wrote:
> Hello. Joe.
> This change broke the full image build of the client ws.

Oh no!

Sorry about that. I'll look into an immediate fix. A longer term fix 
will probably require some further changes to the swing generification, 
possibly making JSlider raw again.

-Joe

>
> /repool/java_re/builds/workspace/9-2-build-solaris-sparcv9/jdk9-client/1141/jdk/src/closed/share/demo/jfc/SwingSet2/SliderDemo.java:167: 
> error: incompatible types: JLabel cannot be converted to CAP#1
>         s.getLabelTable().put(new Integer(11), new JLabel(new 
> Integer(11).toString(), JLabel.CENTER));
>                                                ^
>   where CAP#1 is a fresh type-variable:
>     CAP#1 extends JComponent from capture of ? extends JComponent
>
>
> On 13.08.2014 2:51, Joe Darcy wrote:
>> *ping*
>>
>> Any other comments here?
>>
>> Thanks,
>>
>> -Joe
>>
>> On 08/07/2014 07:20 PM, Joe Darcy wrote:
>>> Hello,
>>>
>>> Please review my changes for
>>>
>>>     JDK-8054360: Refine generification of javax.swing h
>>> http://cr.openjdk.java.net/~darcy/8054360.3/
>>>
>>> Full patch below.
>>>
>>> This resolves many of the source incompatibility exemplars Jan 
>>> Lahoda found in a corpus of programs using swing.
>>>
>>> A few comments on the changes.
>>>
>>> It seems many existing implementations of the TreeNode interface 
>>> have a covariant override of the old raw
>>>
>>>     Enumeration children();
>>>
>>> method which returns an enumeration of the specific TreeNode 
>>> implementation type. The revised generification of
>>>
>>>     Enumeration<? extends TreeNode> children();
>>>
>>> allows those existing implementations to still compile. This is a 
>>> lower-impact way of allowing those types to still compile compared 
>>> to trying to add a type variable to TreeNode.
>>>
>>> After some expert generics advice from Dan Smith, I but together a 
>>> different generification of
>>>
>>>     src/share/classes/javax/swing/table/DefaultTableModel.java
>>>
>>> which has better source compatibility. Quoting from the changes:
>>>
>>>   73     @SuppressWarnings("rawtypes")
>>>   74     protected Vector<Vector>    dataVector;
>>>   75
>>>   76     /** The <code>Vector</code> of column identifiers. */
>>>   77     @SuppressWarnings("rawtypes")
>>>   78     protected Vector    columnIdentifiers;
>>>   79     // Unfortunately, for greater source compatibility the 
>>> inner-most
>>>   80     // Vector in the two fields above is being left raw. The 
>>> Vector is
>>>   81     // read as well as written so using Vector<?> is not 
>>> suitable and
>>>   82     // using Vector<Object> (without adding copying of input 
>>> Vectors),
>>>   83     // would disallow existing code that used, say, a 
>>> Vector<String>
>>>   84     // as an input parameter.
>>>
>>> The setter methods used for these fields are changes to have 
>>> parameters of type Vector<?> and Vector<? extends Vector>, 
>>> respectively.
>>>
>>> The type Vector<? extends Vector> is the most general type which 
>>> captures the implicit constraint of the dataVector field: it is a 
>>> Vector of other Vectors. (It would probably be possible to update 
>>> dataVector to the somewhat more general Vector<List>, but that would 
>>> require changes to the code in other methods of the class.)
>>>
>>> The changes in 
>>> src/share/classes/sun/tools/jconsole/inspector/TableSorter.java 
>>> change the code back to how it was before the swing generification 
>>> changes went in based on the changes to DefaultTableModel.
>>>
>>> Once the exact generification is settled, I'll file the internal ccc 
>>> paperwork.
>>>
>>> Early feedback on using this revised generification on swing code is 
>>> welcome!
>>>
>>> Thanks,
>>>
>>> -Joe
>>>
>>
>
>



From joe.darcy at oracle.com  Sun Aug 17 22:41:47 2014
From: joe.darcy at oracle.com (Joe Darcy)
Date: Sun, 17 Aug 2014 15:41:47 -0700
Subject: <Swing Dev> JDK 9 RFR of JDK-8054360: Refine generification of
 javax.swing
In-Reply-To: <53EFD993.3070106@oracle.com>
References: <53E43407.8090104@oracle.com> <53EA9A68.7060404@oracle.com>
	<53EFB336.7050909@oracle.com> <53EFD993.3070106@oracle.com>
Message-ID: <53F12FAB.1030108@oracle.com>

Hello,

In another thread, I'll send out a code review request for

     JDK-8055254: Address source incompatability of JSlider generification

Thanks,

-Joe

On 08/16/2014 03:22 PM, Joe Darcy wrote:
> Hi Sergey,
>
> On 08/16/2014 12:38 PM, Sergey Bylokhov wrote:
>> Hello. Joe.
>> This change broke the full image build of the client ws.
>
> Oh no!
>
> Sorry about that. I'll look into an immediate fix. A longer term fix 
> will probably require some further changes to the swing 
> generification, possibly making JSlider raw again.
>
> -Joe
>
>>
>> /repool/java_re/builds/workspace/9-2-build-solaris-sparcv9/jdk9-client/1141/jdk/src/closed/share/demo/jfc/SwingSet2/SliderDemo.java:167: 
>> error: incompatible types: JLabel cannot be converted to CAP#1
>>         s.getLabelTable().put(new Integer(11), new JLabel(new 
>> Integer(11).toString(), JLabel.CENTER));
>>                                                ^
>>   where CAP#1 is a fresh type-variable:
>>     CAP#1 extends JComponent from capture of ? extends JComponent
>>
>>
>> On 13.08.2014 2:51, Joe Darcy wrote:
>>> *ping*
>>>
>>> Any other comments here?
>>>
>>> Thanks,
>>>
>>> -Joe
>>>
>>> On 08/07/2014 07:20 PM, Joe Darcy wrote:
>>>> Hello,
>>>>
>>>> Please review my changes for
>>>>
>>>>     JDK-8054360: Refine generification of javax.swing h
>>>> http://cr.openjdk.java.net/~darcy/8054360.3/
>>>>
>>>> Full patch below.
>>>>
>>>> This resolves many of the source incompatibility exemplars Jan 
>>>> Lahoda found in a corpus of programs using swing.
>>>>
>>>> A few comments on the changes.
>>>>
>>>> It seems many existing implementations of the TreeNode interface 
>>>> have a covariant override of the old raw
>>>>
>>>>     Enumeration children();
>>>>
>>>> method which returns an enumeration of the specific TreeNode 
>>>> implementation type. The revised generification of
>>>>
>>>>     Enumeration<? extends TreeNode> children();
>>>>
>>>> allows those existing implementations to still compile. This is a 
>>>> lower-impact way of allowing those types to still compile compared 
>>>> to trying to add a type variable to TreeNode.
>>>>
>>>> After some expert generics advice from Dan Smith, I but together a 
>>>> different generification of
>>>>
>>>> src/share/classes/javax/swing/table/DefaultTableModel.java
>>>>
>>>> which has better source compatibility. Quoting from the changes:
>>>>
>>>>   73     @SuppressWarnings("rawtypes")
>>>>   74     protected Vector<Vector>    dataVector;
>>>>   75
>>>>   76     /** The <code>Vector</code> of column identifiers. */
>>>>   77     @SuppressWarnings("rawtypes")
>>>>   78     protected Vector    columnIdentifiers;
>>>>   79     // Unfortunately, for greater source compatibility the 
>>>> inner-most
>>>>   80     // Vector in the two fields above is being left raw. The 
>>>> Vector is
>>>>   81     // read as well as written so using Vector<?> is not 
>>>> suitable and
>>>>   82     // using Vector<Object> (without adding copying of input 
>>>> Vectors),
>>>>   83     // would disallow existing code that used, say, a 
>>>> Vector<String>
>>>>   84     // as an input parameter.
>>>>
>>>> The setter methods used for these fields are changes to have 
>>>> parameters of type Vector<?> and Vector<? extends Vector>, 
>>>> respectively.
>>>>
>>>> The type Vector<? extends Vector> is the most general type which 
>>>> captures the implicit constraint of the dataVector field: it is a 
>>>> Vector of other Vectors. (It would probably be possible to update 
>>>> dataVector to the somewhat more general Vector<List>, but that 
>>>> would require changes to the code in other methods of the class.)
>>>>
>>>> The changes in 
>>>> src/share/classes/sun/tools/jconsole/inspector/TableSorter.java 
>>>> change the code back to how it was before the swing generification 
>>>> changes went in based on the changes to DefaultTableModel.
>>>>
>>>> Once the exact generification is settled, I'll file the internal 
>>>> ccc paperwork.
>>>>
>>>> Early feedback on using this revised generification on swing code 
>>>> is welcome!
>>>>
>>>> Thanks,
>>>>
>>>> -Joe
>>>>
>>>
>>
>>
>



From joe.darcy at oracle.com  Sun Aug 17 22:53:53 2014
From: joe.darcy at oracle.com (Joe Darcy)
Date: Sun, 17 Aug 2014 15:53:53 -0700
Subject: <Swing Dev> JDK 9 RFR of JDK-8055254: Address source
 incompatability of JSlider generification
Message-ID: <53F13281.70406@oracle.com>

Hello,

As noted by Sergey, the recently pushed changes for

     JDK-8054360: Refine generification of javax.swing

cause one of the files in SwingSet2 to not build, breaking the combined 
open + closed JDK build.

To remedy this situation, at least in the short term, please review the 
proposed changes for

      JDK-8055254: Address source incompatability of JSlider generification
     http://cr.openjdk.java.net/~darcy/8055254.0/

In brief, the label table information in JSlider is reverted to be a raw 
Dictionary rather than

     * A Dictionary<Integer, ? extends JComponent> as under 8054360
     * A Dictionary<Integer, JComponent> as under JDK-8043550 (earlier 
swing generification)

(The usage patterns of the label table from the get/set methods seems to 
include modifying the returned table, which is problematic if wildcards 
are used.)

For a bit more information, here is a diff of the non-javadoc changes 
between the pre JDK-8043550 state of the slider files and the proposed 
changes:

diff JSlider.java ../jdk/src/share/classes/javax/swing/JSlider.java
140a141
 >     @SuppressWarnings("rawtypes")
142c143,145
<
---
 >     // For better source compatibility, the labelTable field and
 >     // associated getter and setter methods are being left as raw
 >     // types.
772c779
<         Enumeration elements = labelTable.elements();
---
 >         Enumeration<?> elements = labelTable.elements();
795a803
 >     @SuppressWarnings("rawtypes")
828a837
 >     @SuppressWarnings("rawtypes")
850a860
 >         @SuppressWarnings("rawtypes")
856c866
<         Enumeration labels = labelTable.keys();
---
 >         Enumeration<?> labels = labelTable.keys();
864a875
 >         @SuppressWarnings("rawtypes")
867c878
<             Enumeration labels = labelTable.elements();
---
 >             Enumeration<?> labels = labelTable.elements();
897c908
<     public Hashtable createStandardLabels( int increment ) {
---
 >     public Hashtable<Integer, JComponent> createStandardLabels( int 
increment ) {
925c936
<     public Hashtable createStandardLabels( int increment, int start ) {
---
 >     public Hashtable<Integer, JComponent> createStandardLabels( int 
increment, int start ) {
934c945
<         class SmartHashtable extends Hashtable<Object, Object> 
implements PropertyChangeListener {
---
 >         class SmartHashtable extends Hashtable<Integer, JComponent> 
implements PropertyChangeListener {
981,982c992,993
<                     Enumeration keys = getLabelTable().keys();
<                     Hashtable<Object, Object> hashtable = new 
Hashtable<Object, Object>();
---
 >                     Enumeration<?> keys = getLabelTable().keys();
 >                     Hashtable<Integer, JComponent> hashtable = new 
Hashtable<>();
986,987c997,998
<                         Object key = keys.nextElement();
<                         Object value = labelTable.get(key);
---
 >                         Integer key = (Integer) keys.nextElement();
 >                         JComponent value = (JComponent) 
labelTable.get(key);
999c1010
<                         Object key = keys.nextElement();
---
 >                         Integer key = (Integer) keys.nextElement();
1015a1027
 >         @SuppressWarnings("rawtypes")
1524d1535
<

diff BasicSliderUI.java 
../jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
399a400
 >             @SuppressWarnings("rawtypes")
403c404
<                 Enumeration elements = dictionary.elements();
---
 >                 Enumeration<?> elements = dictionary.elements();
755a762
 >         @SuppressWarnings("rawtypes")
759c766
<             Enumeration keys = dictionary.keys();
---
 >             Enumeration<?> keys = dictionary.keys();
768a776
 >         @SuppressWarnings("rawtypes")
772c780
<             Enumeration keys = dictionary.keys();
---
 >             Enumeration<?> keys = dictionary.keys();
844a853
 >         @SuppressWarnings("rawtypes")
851c860
<         Enumeration keys = dictionary.keys();
---
 >         Enumeration<?> keys = dictionary.keys();
873a883
 >         @SuppressWarnings("rawtypes")
880c890
<         Enumeration keys = dictionary.keys();
---
 >         Enumeration<?> keys = dictionary.keys();
1123a1142
 >         @SuppressWarnings("rawtypes")
1126c1145
<             Enumeration keys = dictionary.keys();
---
 >             Enumeration<?> keys = dictionary.keys();

diff SynthSliderUI.java 
../jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java | more
2c2
<  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights 
reserved.
---
 >  * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights 
reserved.
394c394,395
<
---
 >
 >                 @SuppressWarnings("rawtypes")
405c406
<                     for (Enumeration keys = dictionary.keys();
---
 >                     for (Enumeration<?> keys = dictionary.keys();

The raw and unchecked warnings are now enabled in the build of the JDK 
so the changes for 8055254 must preserve that property, which is largely 
done by suppressing some warnings and judicious use of some wildcards on 
local variables.

Thanks,

-Joe


From dmitry.markov at oracle.com  Mon Aug 18 08:10:34 2014
From: dmitry.markov at oracle.com (dmitry markov)
Date: Mon, 18 Aug 2014 12:10:34 +0400
Subject: <Swing Dev> [9] Review request for 8048110: Using tables in
 JTextPane leads to infinite loop in FlowLayout.layoutRow
In-Reply-To: <50d74d59-9ebb-4c8b-8e8f-1f4e17bf1074@default>
References: <50d74d59-9ebb-4c8b-8e8f-1f4e17bf1074@default>
Message-ID: <53F1B4FA.4080009@oracle.com>

Hello Sergey,

LogicalView.forwardUpdate() sends update event to all views followed by 
the changed place. This event will cause view to drop the cache and 
re-calculate its break points. This method was added under JDK-8024395 
<https://bugs.openjdk.java.net/browse/JDK-8024395> and intended for the 
documents contained only text elements. The current implementation does 
not expect that non-text element, (e.g. a table) can be added to the 
document.
If the table is added to the document with flow layout, the invocation 
of LogicalView.forwardUpdate() will produce some negative visual effects 
(table will be displayed several times). In case of replacing the text 
by the table the situation much worse, since the FlowView will try to 
re-layout the removed text and hangs.

We have to send the update events to all instances of GlyphView followed 
by changed place for proper text line breaks calculation, see 
JDK-8024395 <https://bugs.openjdk.java.net/browse/JDK-8024395>, 
JDK-8014863 <https://bugs.openjdk.java.net/browse/JDK-8014863>. That's 
why I added checks for GlyphView instance. I understand this might be 
not a good place, but only here we have information about all views in 
the document and can forward update to them, if any.
Please note another approach to solve the problems with line breaks 
calculation - re-calculate break spots any time when a view is laid out. 
As far as I know it is used in jdk6, but this solution is not suitable, 
since it causes serious performance problems in case of large documents.

Also I have updated the fix. New version - 
http://cr.openjdk.java.net/~dmarkov/8048110/jdk9/webrev.01/
Now LogicalView.forwardUpdate() sends update only to GlyphView followed 
by the changed place. This resolves the problem when the table is 
located in the middle of the text line.

Thanks,
Dmitry

On 15/08/2014 12:56, Sergey Bylokhov wrote:
> Hello, Dmitry.
>>> The LogicalView.forwardUpdate() should send an update event to the views
>>> followed by the changed place, only when an instance of GlyphView has
>>> changed; otherwise it should invoke View.forwardUpdate() to handle the
>>> update properly.
> Can you share additional information about the fix. Why LogicalView should send an update if GlyphView was changed only. Because before the fix LocalView knows nothing about GlyphView.
>
> Thanks,
> Dmitry

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140818/88b176e5/attachment.html>

From Sergey.Bylokhov at oracle.com  Mon Aug 18 10:27:17 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Mon, 18 Aug 2014 14:27:17 +0400
Subject: <Swing Dev> JDK 9 RFR of JDK-8055254: Address source
 incompatability of JSlider generification
In-Reply-To: <53F13281.70406@oracle.com>
References: <53F13281.70406@oracle.com>
Message-ID: <53F1D505.8020505@oracle.com>

Hi, Joe.
The fix looks good.

On 18.08.2014 2:53, Joe Darcy wrote:
> Hello,
>
> As noted by Sergey, the recently pushed changes for
>
>     JDK-8054360: Refine generification of javax.swing
>
> cause one of the files in SwingSet2 to not build, breaking the 
> combined open + closed JDK build.
>
> To remedy this situation, at least in the short term, please review 
> the proposed changes for
>
>      JDK-8055254: Address source incompatability of JSlider 
> generification
>     http://cr.openjdk.java.net/~darcy/8055254.0/
>
> In brief, the label table information in JSlider is reverted to be a 
> raw Dictionary rather than
>
>     * A Dictionary<Integer, ? extends JComponent> as under 8054360
>     * A Dictionary<Integer, JComponent> as under JDK-8043550 (earlier 
> swing generification)
>
> (The usage patterns of the label table from the get/set methods seems 
> to include modifying the returned table, which is problematic if 
> wildcards are used.)
>
> For a bit more information, here is a diff of the non-javadoc changes 
> between the pre JDK-8043550 state of the slider files and the proposed 
> changes:
>
> diff JSlider.java ../jdk/src/share/classes/javax/swing/JSlider.java
> 140a141
> >     @SuppressWarnings("rawtypes")
> 142c143,145
> <
> ---
> >     // For better source compatibility, the labelTable field and
> >     // associated getter and setter methods are being left as raw
> >     // types.
> 772c779
> <         Enumeration elements = labelTable.elements();
> ---
> >         Enumeration<?> elements = labelTable.elements();
> 795a803
> >     @SuppressWarnings("rawtypes")
> 828a837
> >     @SuppressWarnings("rawtypes")
> 850a860
> >         @SuppressWarnings("rawtypes")
> 856c866
> <         Enumeration labels = labelTable.keys();
> ---
> >         Enumeration<?> labels = labelTable.keys();
> 864a875
> >         @SuppressWarnings("rawtypes")
> 867c878
> <             Enumeration labels = labelTable.elements();
> ---
> >             Enumeration<?> labels = labelTable.elements();
> 897c908
> <     public Hashtable createStandardLabels( int increment ) {
> ---
> >     public Hashtable<Integer, JComponent> createStandardLabels( int 
> increment ) {
> 925c936
> <     public Hashtable createStandardLabels( int increment, int start ) {
> ---
> >     public Hashtable<Integer, JComponent> createStandardLabels( int 
> increment, int start ) {
> 934c945
> <         class SmartHashtable extends Hashtable<Object, Object> 
> implements PropertyChangeListener {
> ---
> >         class SmartHashtable extends Hashtable<Integer, JComponent> 
> implements PropertyChangeListener {
> 981,982c992,993
> <                     Enumeration keys = getLabelTable().keys();
> <                     Hashtable<Object, Object> hashtable = new 
> Hashtable<Object, Object>();
> ---
> >                     Enumeration<?> keys = getLabelTable().keys();
> >                     Hashtable<Integer, JComponent> hashtable = new 
> Hashtable<>();
> 986,987c997,998
> <                         Object key = keys.nextElement();
> <                         Object value = labelTable.get(key);
> ---
> >                         Integer key = (Integer) keys.nextElement();
> >                         JComponent value = (JComponent) 
> labelTable.get(key);
> 999c1010
> <                         Object key = keys.nextElement();
> ---
> >                         Integer key = (Integer) keys.nextElement();
> 1015a1027
> >         @SuppressWarnings("rawtypes")
> 1524d1535
> <
>
> diff BasicSliderUI.java 
> ../jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
> 399a400
> >             @SuppressWarnings("rawtypes")
> 403c404
> <                 Enumeration elements = dictionary.elements();
> ---
> >                 Enumeration<?> elements = dictionary.elements();
> 755a762
> >         @SuppressWarnings("rawtypes")
> 759c766
> <             Enumeration keys = dictionary.keys();
> ---
> >             Enumeration<?> keys = dictionary.keys();
> 768a776
> >         @SuppressWarnings("rawtypes")
> 772c780
> <             Enumeration keys = dictionary.keys();
> ---
> >             Enumeration<?> keys = dictionary.keys();
> 844a853
> >         @SuppressWarnings("rawtypes")
> 851c860
> <         Enumeration keys = dictionary.keys();
> ---
> >         Enumeration<?> keys = dictionary.keys();
> 873a883
> >         @SuppressWarnings("rawtypes")
> 880c890
> <         Enumeration keys = dictionary.keys();
> ---
> >         Enumeration<?> keys = dictionary.keys();
> 1123a1142
> >         @SuppressWarnings("rawtypes")
> 1126c1145
> <             Enumeration keys = dictionary.keys();
> ---
> >             Enumeration<?> keys = dictionary.keys();
>
> diff SynthSliderUI.java 
> ../jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java | more
> 2c2
> <  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All 
> rights reserved.
> ---
> >  * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All 
> rights reserved.
> 394c394,395
> <
> ---
> >
> >                 @SuppressWarnings("rawtypes")
> 405c406
> <                     for (Enumeration keys = dictionary.keys();
> ---
> >                     for (Enumeration<?> keys = dictionary.keys();
>
> The raw and unchecked warnings are now enabled in the build of the JDK 
> so the changes for 8055254 must preserve that property, which is 
> largely done by suppressing some warnings and judicious use of some 
> wildcards on local variables.
>
> Thanks,
>
> -Joe


-- 
Best regards, Sergey.



From anthony.petrov at oracle.com  Mon Aug 18 11:50:07 2014
From: anthony.petrov at oracle.com (Anthony Petrov)
Date: Mon, 18 Aug 2014 15:50:07 +0400
Subject: <Swing Dev> JDK 9 RFR of JDK-8055254: Address source
 incompatability of JSlider generification
In-Reply-To: <53F1D505.8020505@oracle.com>
References: <53F13281.70406@oracle.com> <53F1D505.8020505@oracle.com>
Message-ID: <53F1E86F.1070506@oracle.com>

+1

--
best regards,
Anthony

On 8/18/2014 2:27 PM, Sergey Bylokhov wrote:
> Hi, Joe.
> The fix looks good.
>
> On 18.08.2014 2:53, Joe Darcy wrote:
>> Hello,
>>
>> As noted by Sergey, the recently pushed changes for
>>
>>     JDK-8054360: Refine generification of javax.swing
>>
>> cause one of the files in SwingSet2 to not build, breaking the
>> combined open + closed JDK build.
>>
>> To remedy this situation, at least in the short term, please review
>> the proposed changes for
>>
>>      JDK-8055254: Address source incompatability of JSlider
>> generification
>>     http://cr.openjdk.java.net/~darcy/8055254.0/
>>
>> In brief, the label table information in JSlider is reverted to be a
>> raw Dictionary rather than
>>
>>     * A Dictionary<Integer, ? extends JComponent> as under 8054360
>>     * A Dictionary<Integer, JComponent> as under JDK-8043550 (earlier
>> swing generification)
>>
>> (The usage patterns of the label table from the get/set methods seems
>> to include modifying the returned table, which is problematic if
>> wildcards are used.)
>>
>> For a bit more information, here is a diff of the non-javadoc changes
>> between the pre JDK-8043550 state of the slider files and the proposed
>> changes:
>>
>> diff JSlider.java ../jdk/src/share/classes/javax/swing/JSlider.java
>> 140a141
>> >     @SuppressWarnings("rawtypes")
>> 142c143,145
>> <
>> ---
>> >     // For better source compatibility, the labelTable field and
>> >     // associated getter and setter methods are being left as raw
>> >     // types.
>> 772c779
>> <         Enumeration elements = labelTable.elements();
>> ---
>> >         Enumeration<?> elements = labelTable.elements();
>> 795a803
>> >     @SuppressWarnings("rawtypes")
>> 828a837
>> >     @SuppressWarnings("rawtypes")
>> 850a860
>> >         @SuppressWarnings("rawtypes")
>> 856c866
>> <         Enumeration labels = labelTable.keys();
>> ---
>> >         Enumeration<?> labels = labelTable.keys();
>> 864a875
>> >         @SuppressWarnings("rawtypes")
>> 867c878
>> <             Enumeration labels = labelTable.elements();
>> ---
>> >             Enumeration<?> labels = labelTable.elements();
>> 897c908
>> <     public Hashtable createStandardLabels( int increment ) {
>> ---
>> >     public Hashtable<Integer, JComponent> createStandardLabels( int
>> increment ) {
>> 925c936
>> <     public Hashtable createStandardLabels( int increment, int start ) {
>> ---
>> >     public Hashtable<Integer, JComponent> createStandardLabels( int
>> increment, int start ) {
>> 934c945
>> <         class SmartHashtable extends Hashtable<Object, Object>
>> implements PropertyChangeListener {
>> ---
>> >         class SmartHashtable extends Hashtable<Integer, JComponent>
>> implements PropertyChangeListener {
>> 981,982c992,993
>> <                     Enumeration keys = getLabelTable().keys();
>> <                     Hashtable<Object, Object> hashtable = new
>> Hashtable<Object, Object>();
>> ---
>> >                     Enumeration<?> keys = getLabelTable().keys();
>> >                     Hashtable<Integer, JComponent> hashtable = new
>> Hashtable<>();
>> 986,987c997,998
>> <                         Object key = keys.nextElement();
>> <                         Object value = labelTable.get(key);
>> ---
>> >                         Integer key = (Integer) keys.nextElement();
>> >                         JComponent value = (JComponent)
>> labelTable.get(key);
>> 999c1010
>> <                         Object key = keys.nextElement();
>> ---
>> >                         Integer key = (Integer) keys.nextElement();
>> 1015a1027
>> >         @SuppressWarnings("rawtypes")
>> 1524d1535
>> <
>>
>> diff BasicSliderUI.java
>> ../jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
>> 399a400
>> >             @SuppressWarnings("rawtypes")
>> 403c404
>> <                 Enumeration elements = dictionary.elements();
>> ---
>> >                 Enumeration<?> elements = dictionary.elements();
>> 755a762
>> >         @SuppressWarnings("rawtypes")
>> 759c766
>> <             Enumeration keys = dictionary.keys();
>> ---
>> >             Enumeration<?> keys = dictionary.keys();
>> 768a776
>> >         @SuppressWarnings("rawtypes")
>> 772c780
>> <             Enumeration keys = dictionary.keys();
>> ---
>> >             Enumeration<?> keys = dictionary.keys();
>> 844a853
>> >         @SuppressWarnings("rawtypes")
>> 851c860
>> <         Enumeration keys = dictionary.keys();
>> ---
>> >         Enumeration<?> keys = dictionary.keys();
>> 873a883
>> >         @SuppressWarnings("rawtypes")
>> 880c890
>> <         Enumeration keys = dictionary.keys();
>> ---
>> >         Enumeration<?> keys = dictionary.keys();
>> 1123a1142
>> >         @SuppressWarnings("rawtypes")
>> 1126c1145
>> <             Enumeration keys = dictionary.keys();
>> ---
>> >             Enumeration<?> keys = dictionary.keys();
>>
>> diff SynthSliderUI.java
>> ../jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java | more
>> 2c2
>> <  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All
>> rights reserved.
>> ---
>> >  * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All
>> rights reserved.
>> 394c394,395
>> <
>> ---
>> >
>> >                 @SuppressWarnings("rawtypes")
>> 405c406
>> <                     for (Enumeration keys = dictionary.keys();
>> ---
>> >                     for (Enumeration<?> keys = dictionary.keys();
>>
>> The raw and unchecked warnings are now enabled in the build of the JDK
>> so the changes for 8055254 must preserve that property, which is
>> largely done by suppressing some warnings and judicious use of some
>> wildcards on local variables.
>>
>> Thanks,
>>
>> -Joe
>
>


From Sergey.Bylokhov at oracle.com  Mon Aug 18 13:54:51 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Mon, 18 Aug 2014 17:54:51 +0400
Subject: <Swing Dev> [9] Review Request: 8049346 fix the @run line of
 the test: jdk/test/java/awt/Focus/SortingFTP/JDK8048887.java
In-Reply-To: <53B6AFFD.5010907@oracle.com>
References: <53B6AFFD.5010907@oracle.com>
Message-ID: <53F205AB.5060508@oracle.com>

Hi, Anton.
The fix looks good.

On 04.07.2014 17:45, Anton V. Tarasov wrote:
> Hello,
>
> Please, review a fix of the reg test for JDK-8048887, where I put a 
> wrong bugid into the @run tag:
>
> bug: https://bugs.openjdk.java.net/browse/JDK-8049346
> webrev: http://cr.openjdk.java.net/~ant/JDK-8049346/webrev.0
>
> (The test works fine, now with jtreg as well)
>
> Thanks!
> Anton.


-- 
Best regards, Sergey.



From Sergey.Bylokhov at oracle.com  Mon Aug 18 14:18:21 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Mon, 18 Aug 2014 18:18:21 +0400
Subject: <Swing Dev> [9] Review Request: 6329748 Invalid/old variable name -
 newModel in setModel method in JTable class
Message-ID: <53F20B2D.1080704@oracle.com>

Hello.
Please review the small fix for jdk 9.
Bug description:
Long long time ago all our JTable.set*model methods used newModel as a 
parameter.
Since then:
  - setModel() parameterand at param tag were changed from newModel to 
dataModel, but method description and @exception were not updated.
  - setColumnModel parameter, @param and @exception tags werechanged 
from newModel to columnModel, but method description was not updated.
  - setSelectionModel was not updated at all.

Plus in the fix I align description of all of these methods to the one 
style.

Bug: https://bugs.openjdk.java.net/browse/JDK-6329748
Webrev can be found at: http://cr.openjdk.java.net/~serb/6329748/webrev.00

-- 
Best regards, Sergey.



From joe.darcy at oracle.com  Tue Aug 19 01:33:36 2014
From: joe.darcy at oracle.com (Joe Darcy)
Date: Mon, 18 Aug 2014 18:33:36 -0700
Subject: <Swing Dev> JDK 9 RFR of JDK-8055059: JDK9b22 public API exposes
 package private classes
Message-ID: <53F2A970.4060500@oracle.com>

Hello,

Please review my proposed changes to address:

     JDK-8055059: JDK9b22 public API exposes package private classes
     http://cr.openjdk.java.net/~darcy/8055059.0/

Bug JDK-8055059 that the generification of swing added package-private 
types to the signatures of several protected methods. The solution is to 
the make the formerly package-private types also be protected.

Patch below.

Thanks,

-Joe

--- old/src/share/classes/javax/swing/text/GapContent.java 2014-08-18 
18:27:50.000000000 -0700
+++ new/src/share/classes/javax/swing/text/GapContent.java 2014-08-18 
18:27:49.000000000 -0700
@@ -826,7 +826,7 @@
       * Used to hold a reference to a Mark that is being reset as the
       * result of removing from the content.
       */
-    final class UndoPosRef {
+    protected final class UndoPosRef {
          UndoPosRef(MarkData rec) {
              this.rec = rec;
              this.undoLocation = rec.getOffset();
@@ -839,7 +839,7 @@
           * @param endOffset end location of inserted string.
           * @param g1 resulting end of gap.
           */
-        protected void resetLocation(int endOffset, int g1) {
+        void resetLocation(int endOffset, int g1) {
              if (undoLocation != endOffset) {
                  this.rec.index = undoLocation;
              }
@@ -849,9 +849,9 @@
          }

          /** Previous Offset of rec. */
-        protected int undoLocation;
+        private int undoLocation;
          /** Mark to reset offset. */
-        protected MarkData rec;
+        private MarkData rec;
      } // End of GapContent.UndoPosRef


--- old/src/share/classes/javax/swing/text/StringContent.java 2014-08-18 
18:27:50.000000000 -0700
+++ new/src/share/classes/javax/swing/text/StringContent.java 2014-08-18 
18:27:50.000000000 -0700
@@ -366,7 +366,7 @@
       * Used to hold a reference to a Position that is being reset as the
       * result of removing from the content.
       */
-    final class UndoPosRef {
+    protected final class UndoPosRef {
          UndoPosRef(PosRec rec) {
              this.rec = rec;
              this.undoLocation = rec.offset;
@@ -376,14 +376,14 @@
           * Resets the location of the Position to the offset when the
           * receiver was instantiated.
           */
-        protected void resetLocation() {
+        void resetLocation() {
              rec.offset = undoLocation;
          }

          /** Location to reset to when resetLocatino is invoked. */
-        protected int undoLocation;
+        private int undoLocation;
          /** Position to reset offset. */
-        protected PosRec rec;
+        private PosRec rec;
      }

      /**



From holger.brands at googlemail.com  Tue Aug 19 09:03:00 2014
From: holger.brands at googlemail.com (Holger Brands)
Date: Tue, 19 Aug 2014 11:03:00 +0200
Subject: <Swing Dev> Another incarnation of the EventQueue NPE
In-Reply-To: <8583BE90-FF1D-45B0-9215-960C7CA9A2D4@oracle.com>
References: <CACPuacss=vTKu-1+JBYN1GFuVx_i3wxHMZ4gVbk5gMg_m2+caA@mail.gmail.com>
	<8583BE90-FF1D-45B0-9215-960C7CA9A2D4@oracle.com>
Message-ID: <CACPuacv4cRFyGue43OyEjaZR4GYU3t_b6df-5au+ykCP6EZiCA@mail.gmail.com>

Hi again,

I see that this issue is fixed in 9 and backported to 8u40:
https://bugs.openjdk.java.net/browse/JDK-8043610
https://bugs.openjdk.java.net/browse/JDK-8048861
Thanks for that!

I'd like to ask for a backport to a forthcoming Java 7 Update release,
because it's an obvious regression and we observe this issue frequently.

Thanks,
Holger



2014-02-20 20:20 GMT+01:00 Petr Pchelko <petr.pchelko at oracle.com>:

> Hello, Holger.
>
> Thank you for the report.
>
> The reason is that the ThreadPool is creating a thread in a ThreadGroup
> which is not associated with any AppContext.
> I suppose that the fix for JDK-8019274 would also resolve this issue, but
> this should be checked. I?ll write back as I have a chance to check this.
>
> With best regards. Petr.
>
> 20 ????. 2014 ?., ? 11:01 ????? ???????, Holger Brands <
> holger.brands at googlemail.com> ???????(?):
>
> Hi there,
>
> this is meant as a comment to issue
> https://bugs.openjdk.java.net/browse/JDK-8019274
> which describes a problem of RMI threads calling out to
> java.awt.EventQueue in a java webstart app.
>
> I think it's a more general problem, not only related to RMI threads.
> Another scenario is the following:
> When you open a JFileChooser in a Java Webstart application, change the
> view to "Details" such that column headers appear and then click on the
> name column to sort the shown entries, I get the
> following exception on Windows 7, both with Java 7u45 and Java 7u51:
>
> java.lang.NullPointerException
>      at sun.awt.SunToolkit.getSystemEventQueueImplPP(Unknown Source)
>      at sun.awt.SunToolkit.getSystemEventQueueImplPP(Unknown Source)
>      at sun.awt.SunToolkit.getSystemEventQueueImpl(Unknown Source)
>      at java.awt.Toolkit.getEventQueue(Unknown Source)
>      at java.awt.EventQueue.isDispatchThread(Unknown Source)
>      at javax.swing.SwingUtilities.isEventDispatchThread(Unknown Source)
>      at javax.swing.JComponent.revalidate(Unknown Source)
>      at javax.swing.JTable.resizeAndRepaint(Unknown Source)
>      at javax.swing.JTable.sortedTableChanged(Unknown Source)
>      at javax.swing.JTable.sorterChanged(Unknown Source)
>      at javax.swing.RowSorter.fireRowSorterChanged(Unknown Source)
>      at javax.swing.RowSorter.fireRowSorterChanged(Unknown Source)
>      at javax.swing.DefaultRowSorter.sort(Unknown Source)
>      at sun.swing.FilePane$DetailsTableRowSorter.access$1601(Unknown
> Source)
>      at sun.swing.FilePane$DetailsTableRowSorter$1.call(Unknown Source)
>      at sun.swing.FilePane$DetailsTableRowSorter$1.call(Unknown Source)
>      at java.util.concurrent.FutureTask.run(Unknown Source)
>      at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
>      at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
>      at sun.awt.shell.Win32ShellFolderManager2$ComInvoker$3.run(Unknown
> Source)
>      at java.lang.Thread.run(Unknown Source)
>
> It's a similiar stacktrace but not quite the same.
> But I bet it's the same cause.
>
> Please ensure when fixing JDK-8019274 that this variant is also fixed.
> Also, I would be interested in a workaround for this FileChooser sorting
> issue.
>
> Thanks,
> Holger
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140819/d4333dc9/attachment.html>

From anthony.petrov at oracle.com  Tue Aug 19 12:34:48 2014
From: anthony.petrov at oracle.com (Anthony Petrov)
Date: Tue, 19 Aug 2014 16:34:48 +0400
Subject: <Swing Dev> JDK 9 RFR of JDK-8055059: JDK9b22 public API
 exposes package private classes
In-Reply-To: <53F2A970.4060500@oracle.com>
References: <53F2A970.4060500@oracle.com>
Message-ID: <53F34468.3060803@oracle.com>

Hi Joe,

I'm not sure if exposing internal classes is a good idea. There's 
absolutely no need for user code to even know about them. If the only 
reason we have to make them protected is because they're exposed with 
the generification fix, then perhaps we could just revert the 
generifications (and add corresponding @SuppressWarning) for these 
specific cases?

--
best regards,
Anthony

On 8/19/2014 5:33 AM, Joe Darcy wrote:
> Hello,
>
> Please review my proposed changes to address:
>
>      JDK-8055059: JDK9b22 public API exposes package private classes
>      http://cr.openjdk.java.net/~darcy/8055059.0/
>
> Bug JDK-8055059 that the generification of swing added package-private
> types to the signatures of several protected methods. The solution is to
> the make the formerly package-private types also be protected.
>
> Patch below.
>
> Thanks,
>
> -Joe
>
> --- old/src/share/classes/javax/swing/text/GapContent.java 2014-08-18
> 18:27:50.000000000 -0700
> +++ new/src/share/classes/javax/swing/text/GapContent.java 2014-08-18
> 18:27:49.000000000 -0700
> @@ -826,7 +826,7 @@
>        * Used to hold a reference to a Mark that is being reset as the
>        * result of removing from the content.
>        */
> -    final class UndoPosRef {
> +    protected final class UndoPosRef {
>           UndoPosRef(MarkData rec) {
>               this.rec = rec;
>               this.undoLocation = rec.getOffset();
> @@ -839,7 +839,7 @@
>            * @param endOffset end location of inserted string.
>            * @param g1 resulting end of gap.
>            */
> -        protected void resetLocation(int endOffset, int g1) {
> +        void resetLocation(int endOffset, int g1) {
>               if (undoLocation != endOffset) {
>                   this.rec.index = undoLocation;
>               }
> @@ -849,9 +849,9 @@
>           }
>
>           /** Previous Offset of rec. */
> -        protected int undoLocation;
> +        private int undoLocation;
>           /** Mark to reset offset. */
> -        protected MarkData rec;
> +        private MarkData rec;
>       } // End of GapContent.UndoPosRef
>
>
> --- old/src/share/classes/javax/swing/text/StringContent.java 2014-08-18
> 18:27:50.000000000 -0700
> +++ new/src/share/classes/javax/swing/text/StringContent.java 2014-08-18
> 18:27:50.000000000 -0700
> @@ -366,7 +366,7 @@
>        * Used to hold a reference to a Position that is being reset as the
>        * result of removing from the content.
>        */
> -    final class UndoPosRef {
> +    protected final class UndoPosRef {
>           UndoPosRef(PosRec rec) {
>               this.rec = rec;
>               this.undoLocation = rec.offset;
> @@ -376,14 +376,14 @@
>            * Resets the location of the Position to the offset when the
>            * receiver was instantiated.
>            */
> -        protected void resetLocation() {
> +        void resetLocation() {
>               rec.offset = undoLocation;
>           }
>
>           /** Location to reset to when resetLocatino is invoked. */
> -        protected int undoLocation;
> +        private int undoLocation;
>           /** Position to reset offset. */
> -        protected PosRec rec;
> +        private PosRec rec;
>       }
>
>       /**
>


From neugens at redhat.com  Tue Aug 19 12:51:23 2014
From: neugens at redhat.com (Mario Torre)
Date: Tue, 19 Aug 2014 14:51:23 +0200
Subject: <Swing Dev> JDK 9 RFR of JDK-8055059: JDK9b22 public API
 exposes package private classes
In-Reply-To: <53F34468.3060803@oracle.com>
References: <53F2A970.4060500@oracle.com> <53F34468.3060803@oracle.com>
Message-ID: <1408452683.3833.13.camel@nirvana.localdomain>

On Tue, 2014-08-19 at 16:34 +0400, Anthony Petrov wrote:
> Hi Joe,
> 
> I'm not sure if exposing internal classes is a good idea. There's 
> absolutely no need for user code to even know about them. If the only 
> reason we have to make them protected is because they're exposed with 
> the generification fix, then perhaps we could just revert the 
> generifications (and add corresponding @SuppressWarning) for these 
> specific cases?

Is not many of those, but I would be a bit against exposing those things
as well.

Cheers,
Mario




From Sergey.Bylokhov at oracle.com  Tue Aug 19 15:32:04 2014
From: Sergey.Bylokhov at oracle.com (Sergey Bylokhov)
Date: Tue, 19 Aug 2014 19:32:04 +0400
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>	<53E7FA44.9050207@oracle.com>	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
Message-ID: <53F36DF4.6000008@oracle.com>

Hi Ot?vio,
The new alignment in DataLine.java/JColorChooser.java looks strange.
Wrong change in BasicTableUI.java:
-                    plainStr.deleteCharAt(plainStr.length() - 
1).append("\n");
+                    plainStr.deleteCharAt(plainStr.length() - 
1).append('\t');

On 13.08.2014 3:01, Ot?vio Gon?alves de Santana wrote:
> Thank you Roger.
> Done
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_6.zip
>
>
> On Tue, Aug 12, 2014 at 10:15 AM, roger riggs <roger.riggs at oracle.com>
> wrote:
>
>> fyi,
>>
>> There's a Perl script normalizer.pl that detects/fixes most of the simple
>> tab/white space issues.
>> The script is in the <repo>/make/scripts/normalizer.pl
>>
>> Roger
>>
>>
>> On 8/12/2014 3:48 AM, Andrej Golovnin wrote:
>>
>>> Hi Ot?vio,
>>>
>>> I think you should fix the indentation in a lot of classes. You use the
>>> tab-character for the indentation. As far as I know we should use the
>>> space
>>> character for the indentation in the JDK sources (Oracle devs feel free to
>>> correct me if I'm wrong. And it would be really nice if the style guide
>>> for
>>> the source code would be a part of the JDK repository. So we don't need to
>>> search for it on the internet/wiki. Just clone the repository, read the
>>> style guide and follow it. :-) ). Here is the not complete list of classes
>>> where you used the tab-character for the indentation:
>>>
>>> src/share/classes/com/sun/crypto/provider/OAEPParameters.java
>>> src/share/classes/java/lang/management/MemoryUsage.java
>>> src/share/classes/java/security/KeyStore.java
>>> src/share/classes/java/security/PermissionCollection.java
>>> src/share/classes/java/security/ProtectionDomain.java
>>> src/share/classes/java/security/cert/CertPath.java
>>> src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
>>> src/share/classes/java/security/cert/PKIXParameters.java
>>> src/share/classes/java/security/cert/PolicyQualifierInfo.java
>>> src/share/classes/java/security/cert/TrustAnchor.java
>>> src/share/classes/java/security/cert/X509CertSelector.java
>>> src/share/classes/javax/crypto/CryptoPermission.java
>>> src/share/classes/javax/management/relation/Role.java
>>>
>>>
>>> In src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj in the line 423 a
>>> dot
>>> is missed before append:
>>>
>>> 423   {jjtn000.name.append( '.')append(t.image); }
>>>
>>> Best regards,
>>> Andrej Golovnin
>>>
>>
>


-- 
Best regards, Sergey.



From joe.darcy at oracle.com  Tue Aug 19 15:43:50 2014
From: joe.darcy at oracle.com (Joe Darcy)
Date: Tue, 19 Aug 2014 08:43:50 -0700
Subject: <Swing Dev> JDK 9 RFR of JDK-8055059: JDK9b22 public API
 exposes package private classes
In-Reply-To: <53F34468.3060803@oracle.com>
References: <53F2A970.4060500@oracle.com> <53F34468.3060803@oracle.com>
Message-ID: <53F370B6.9000505@oracle.com>

Hi Anthony,

The methods where the UndoPosRef type is used in the generification are 
protected methods and UndoPosRef occurs in the argument list; from 
GapContent:

     protected Vector<UndoPosRef> getPositionsInRange(Vector<UndoPosRef> 
v, int offset, int length)

     protected void updateUndoPositions(Vector<UndoPosRef> positions, 
int offset, int length)

The second method includes the disclaimer

      "This is meant for internal usage, and is generally not of 
interest to subclasses."

but the first method does not. As a protected method, either of these 
can be called by subclasses. Therefore, it seems to me the subclasses 
should be able to know the types of the objects in the vectors being 
passed into or returned.

Thanks,

-Joe

On 08/19/2014 05:34 AM, Anthony Petrov wrote:
> Hi Joe,
>
> I'm not sure if exposing internal classes is a good idea. There's 
> absolutely no need for user code to even know about them. If the only 
> reason we have to make them protected is because they're exposed with 
> the generification fix, then perhaps we could just revert the 
> generifications (and add corresponding @SuppressWarning) for these 
> specific cases?
>
> -- 
> best regards,
> Anthony
>
> On 8/19/2014 5:33 AM, Joe Darcy wrote:
>> Hello,
>>
>> Please review my proposed changes to address:
>>
>>      JDK-8055059: JDK9b22 public API exposes package private classes
>>      http://cr.openjdk.java.net/~darcy/8055059.0/
>>
>> Bug JDK-8055059 that the generification of swing added package-private
>> types to the signatures of several protected methods. The solution is to
>> the make the formerly package-private types also be protected.
>>
>> Patch below.
>>
>> Thanks,
>>
>> -Joe
>>
>> --- old/src/share/classes/javax/swing/text/GapContent.java 2014-08-18
>> 18:27:50.000000000 -0700
>> +++ new/src/share/classes/javax/swing/text/GapContent.java 2014-08-18
>> 18:27:49.000000000 -0700
>> @@ -826,7 +826,7 @@
>>        * Used to hold a reference to a Mark that is being reset as the
>>        * result of removing from the content.
>>        */
>> -    final class UndoPosRef {
>> +    protected final class UndoPosRef {
>>           UndoPosRef(MarkData rec) {
>>               this.rec = rec;
>>               this.undoLocation = rec.getOffset();
>> @@ -839,7 +839,7 @@
>>            * @param endOffset end location of inserted string.
>>            * @param g1 resulting end of gap.
>>            */
>> -        protected void resetLocation(int endOffset, int g1) {
>> +        void resetLocation(int endOffset, int g1) {
>>               if (undoLocation != endOffset) {
>>                   this.rec.index = undoLocation;
>>               }
>> @@ -849,9 +849,9 @@
>>           }
>>
>>           /** Previous Offset of rec. */
>> -        protected int undoLocation;
>> +        private int undoLocation;
>>           /** Mark to reset offset. */
>> -        protected MarkData rec;
>> +        private MarkData rec;
>>       } // End of GapContent.UndoPosRef
>>
>>
>> --- old/src/share/classes/javax/swing/text/StringContent.java 2014-08-18
>> 18:27:50.000000000 -0700
>> +++ new/src/share/classes/javax/swing/text/StringContent.java 2014-08-18
>> 18:27:50.000000000 -0700
>> @@ -366,7 +366,7 @@
>>        * Used to hold a reference to a Position that is being reset 
>> as the
>>        * result of removing from the content.
>>        */
>> -    final class UndoPosRef {
>> +    protected final class UndoPosRef {
>>           UndoPosRef(PosRec rec) {
>>               this.rec = rec;
>>               this.undoLocation = rec.offset;
>> @@ -376,14 +376,14 @@
>>            * Resets the location of the Position to the offset when the
>>            * receiver was instantiated.
>>            */
>> -        protected void resetLocation() {
>> +        void resetLocation() {
>>               rec.offset = undoLocation;
>>           }
>>
>>           /** Location to reset to when resetLocatino is invoked. */
>> -        protected int undoLocation;
>> +        private int undoLocation;
>>           /** Position to reset offset. */
>> -        protected PosRec rec;
>> +        private PosRec rec;
>>       }
>>
>>       /**
>>



From anthony.petrov at oracle.com  Tue Aug 19 16:16:17 2014
From: anthony.petrov at oracle.com (Anthony Petrov)
Date: Tue, 19 Aug 2014 20:16:17 +0400
Subject: <Swing Dev> JDK 9 RFR of JDK-8055059: JDK9b22 public API
 exposes package private classes
In-Reply-To: <53F370B6.9000505@oracle.com>
References: <53F2A970.4060500@oracle.com> <53F34468.3060803@oracle.com>
	<53F370B6.9000505@oracle.com>
Message-ID: <53F37851.7030607@oracle.com>

In theory, I agree. However, these methods didn't declare the type of 
objects in the Vectors since they were introduced, and we didn't see any 
RFEs to expose the types, which means that nobody really uses the 
methods outside JDK.

I believe that the missing notice about internal usage of the first 
method is a mistake, it should have been there from the beginning.

Finally, even if you make UndoPosRef visible, it is still an opaque 
type: there's no way to create instances of it, and no any public 
methods or fields. It doesn't make much sense to simply expose the name 
of the type w/o giving developers any control over it (which, as we 
know, has never been requested by those developers yet).

So I'm still unconvinced whether those internal classes should be exposed.

--
best regards,
Anthony

On 8/19/2014 7:43 PM, Joe Darcy wrote:
> Hi Anthony,
>
> The methods where the UndoPosRef type is used in the generification are
> protected methods and UndoPosRef occurs in the argument list; from
> GapContent:
>
>      protected Vector<UndoPosRef> getPositionsInRange(Vector<UndoPosRef>
> v, int offset, int length)
>
>      protected void updateUndoPositions(Vector<UndoPosRef> positions,
> int offset, int length)
>
> The second method includes the disclaimer
>
>       "This is meant for internal usage, and is generally not of
> interest to subclasses."
>
> but the first method does not. As a protected method, either of these
> can be called by subclasses. Therefore, it seems to me the subclasses
> should be able to know the types of the objects in the vectors being
> passed into or returned.
>
> Thanks,
>
> -Joe
>
> On 08/19/2014 05:34 AM, Anthony Petrov wrote:
>> Hi Joe,
>>
>> I'm not sure if exposing internal classes is a good idea. There's
>> absolutely no need for user code to even know about them. If the only
>> reason we have to make them protected is because they're exposed with
>> the generification fix, then perhaps we could just revert the
>> generifications (and add corresponding @SuppressWarning) for these
>> specific cases?
>>
>> --
>> best regards,
>> Anthony
>>
>> On 8/19/2014 5:33 AM, Joe Darcy wrote:
>>> Hello,
>>>
>>> Please review my proposed changes to address:
>>>
>>>      JDK-8055059: JDK9b22 public API exposes package private classes
>>>      http://cr.openjdk.java.net/~darcy/8055059.0/
>>>
>>> Bug JDK-8055059 that the generification of swing added package-private
>>> types to the signatures of several protected methods. The solution is to
>>> the make the formerly package-private types also be protected.
>>>
>>> Patch below.
>>>
>>> Thanks,
>>>
>>> -Joe
>>>
>>> --- old/src/share/classes/javax/swing/text/GapContent.java 2014-08-18
>>> 18:27:50.000000000 -0700
>>> +++ new/src/share/classes/javax/swing/text/GapContent.java 2014-08-18
>>> 18:27:49.000000000 -0700
>>> @@ -826,7 +826,7 @@
>>>        * Used to hold a reference to a Mark that is being reset as the
>>>        * result of removing from the content.
>>>        */
>>> -    final class UndoPosRef {
>>> +    protected final class UndoPosRef {
>>>           UndoPosRef(MarkData rec) {
>>>               this.rec = rec;
>>>               this.undoLocation = rec.getOffset();
>>> @@ -839,7 +839,7 @@
>>>            * @param endOffset end location of inserted string.
>>>            * @param g1 resulting end of gap.
>>>            */
>>> -        protected void resetLocation(int endOffset, int g1) {
>>> +        void resetLocation(int endOffset, int g1) {
>>>               if (undoLocation != endOffset) {
>>>                   this.rec.index = undoLocation;
>>>               }
>>> @@ -849,9 +849,9 @@
>>>           }
>>>
>>>           /** Previous Offset of rec. */
>>> -        protected int undoLocation;
>>> +        private int undoLocation;
>>>           /** Mark to reset offset. */
>>> -        protected MarkData rec;
>>> +        private MarkData rec;
>>>       } // End of GapContent.UndoPosRef
>>>
>>>
>>> --- old/src/share/classes/javax/swing/text/StringContent.java 2014-08-18
>>> 18:27:50.000000000 -0700
>>> +++ new/src/share/classes/javax/swing/text/StringContent.java 2014-08-18
>>> 18:27:50.000000000 -0700
>>> @@ -366,7 +366,7 @@
>>>        * Used to hold a reference to a Position that is being reset
>>> as the
>>>        * result of removing from the content.
>>>        */
>>> -    final class UndoPosRef {
>>> +    protected final class UndoPosRef {
>>>           UndoPosRef(PosRec rec) {
>>>               this.rec = rec;
>>>               this.undoLocation = rec.offset;
>>> @@ -376,14 +376,14 @@
>>>            * Resets the location of the Position to the offset when the
>>>            * receiver was instantiated.
>>>            */
>>> -        protected void resetLocation() {
>>> +        void resetLocation() {
>>>               rec.offset = undoLocation;
>>>           }
>>>
>>>           /** Location to reset to when resetLocatino is invoked. */
>>> -        protected int undoLocation;
>>> +        private int undoLocation;
>>>           /** Position to reset offset. */
>>> -        protected PosRec rec;
>>> +        private PosRec rec;
>>>       }
>>>
>>>       /**
>>>
>


From philip.race at oracle.com  Tue Aug 19 16:48:27 2014
From: philip.race at oracle.com (Phil Race)
Date: Tue, 19 Aug 2014 09:48:27 -0700
Subject: <Swing Dev> JDK 9 RFR of JDK-8055059: JDK9b22 public API
 exposes package private classes
In-Reply-To: <53F37851.7030607@oracle.com>
References: <53F2A970.4060500@oracle.com>
	<53F34468.3060803@oracle.com>	<53F370B6.9000505@oracle.com>
	<53F37851.7030607@oracle.com>
Message-ID: <53F37FDB.5010200@oracle.com>

I don't know this package very well but it seems like it was a bit of a 
messed up design
from the beginning if it exposed methods which had a vector of opaque 
types meant
only for internal use. How would an application ever be able to call 
them or subclass
them?  Amusingly perhaps the javadoc for both these methods actually mention
UndoPosRef by name.

The defining class, GapContent is never used anywhere in public API.
I imagine this to be one example of the many types exposed in Swing only 
because
there was no equivalent of C++ friends and it was needed in another package.
I found that apart from the swing.text package in which it is defined it 
is used
only once outside its own package, in the swing.text.html sub-package

So I am fairly sure that really the whole GapContent class is for 
internal use only
and the same follows for UndoPosRef, so I'd vote against making it public.
I'd actually remove reference to it from thepublic  javadoc and say its
an implementation private type.

-phil.



On 8/19/2014 9:16 AM, Anthony Petrov wrote:
> In theory, I agree. However, these methods didn't declare the type of 
> objects in the Vectors since they were introduced, and we didn't see 
> any RFEs to expose the types, which means that nobody really uses the 
> methods outside JDK.
>
> I believe that the missing notice about internal usage of the first 
> method is a mistake, it should have been there from the beginning.
>
> Finally, even if you make UndoPosRef visible, it is still an opaque 
> type: there's no way to create instances of it, and no any public 
> methods or fields. It doesn't make much sense to simply expose the 
> name of the type w/o giving developers any control over it (which, as 
> we know, has never been requested by those developers yet).
>
> So I'm still unconvinced whether those internal classes should be 
> exposed.
>
> -- 
> best regards,
> Anthony
>
> On 8/19/2014 7:43 PM, Joe Darcy wrote:
>> Hi Anthony,
>>
>> The methods where the UndoPosRef type is used in the generification are
>> protected methods and UndoPosRef occurs in the argument list; from
>> GapContent:
>>
>>      protected Vector<UndoPosRef> getPositionsInRange(Vector<UndoPosRef>
>> v, int offset, int length)
>>
>>      protected void updateUndoPositions(Vector<UndoPosRef> positions,
>> int offset, int length)
>>
>> The second method includes the disclaimer
>>
>>       "This is meant for internal usage, and is generally not of
>> interest to subclasses."
>>
>> but the first method does not. As a protected method, either of these
>> can be called by subclasses. Therefore, it seems to me the subclasses
>> should be able to know the types of the objects in the vectors being
>> passed into or returned.
>>
>> Thanks,
>>
>> -Joe
>>
>> On 08/19/2014 05:34 AM, Anthony Petrov wrote:
>>> Hi Joe,
>>>
>>> I'm not sure if exposing internal classes is a good idea. There's
>>> absolutely no need for user code to even know about them. If the only
>>> reason we have to make them protected is because they're exposed with
>>> the generification fix, then perhaps we could just revert the
>>> generifications (and add corresponding @SuppressWarning) for these
>>> specific cases?
>>>
>>> -- 
>>> best regards,
>>> Anthony
>>>
>>> On 8/19/2014 5:33 AM, Joe Darcy wrote:
>>>> Hello,
>>>>
>>>> Please review my proposed changes to address:
>>>>
>>>>      JDK-8055059: JDK9b22 public API exposes package private classes
>>>>      http://cr.openjdk.java.net/~darcy/8055059.0/
>>>>
>>>> Bug JDK-8055059 that the generification of swing added package-private
>>>> types to the signatures of several protected methods. The solution 
>>>> is to
>>>> the make the formerly package-private types also be protected.
>>>>
>>>> Patch below.
>>>>
>>>> Thanks,
>>>>
>>>> -Joe
>>>>
>>>> --- old/src/share/classes/javax/swing/text/GapContent.java 2014-08-18
>>>> 18:27:50.000000000 -0700
>>>> +++ new/src/share/classes/javax/swing/text/GapContent.java 2014-08-18
>>>> 18:27:49.000000000 -0700
>>>> @@ -826,7 +826,7 @@
>>>>        * Used to hold a reference to a Mark that is being reset as the
>>>>        * result of removing from the content.
>>>>        */
>>>> -    final class UndoPosRef {
>>>> +    protected final class UndoPosRef {
>>>>           UndoPosRef(MarkData rec) {
>>>>               this.rec = rec;
>>>>               this.undoLocation = rec.getOffset();
>>>> @@ -839,7 +839,7 @@
>>>>            * @param endOffset end location of inserted string.
>>>>            * @param g1 resulting end of gap.
>>>>            */
>>>> -        protected void resetLocation(int endOffset, int g1) {
>>>> +        void resetLocation(int endOffset, int g1) {
>>>>               if (undoLocation != endOffset) {
>>>>                   this.rec.index = undoLocation;
>>>>               }
>>>> @@ -849,9 +849,9 @@
>>>>           }
>>>>
>>>>           /** Previous Offset of rec. */
>>>> -        protected int undoLocation;
>>>> +        private int undoLocation;
>>>>           /** Mark to reset offset. */
>>>> -        protected MarkData rec;
>>>> +        private MarkData rec;
>>>>       } // End of GapContent.UndoPosRef
>>>>
>>>>
>>>> --- old/src/share/classes/javax/swing/text/StringContent.java 
>>>> 2014-08-18
>>>> 18:27:50.000000000 -0700
>>>> +++ new/src/share/classes/javax/swing/text/StringContent.java 
>>>> 2014-08-18
>>>> 18:27:50.000000000 -0700
>>>> @@ -366,7 +366,7 @@
>>>>        * Used to hold a reference to a Position that is being reset
>>>> as the
>>>>        * result of removing from the content.
>>>>        */
>>>> -    final class UndoPosRef {
>>>> +    protected final class UndoPosRef {
>>>>           UndoPosRef(PosRec rec) {
>>>>               this.rec = rec;
>>>>               this.undoLocation = rec.offset;
>>>> @@ -376,14 +376,14 @@
>>>>            * Resets the location of the Position to the offset when 
>>>> the
>>>>            * receiver was instantiated.
>>>>            */
>>>> -        protected void resetLocation() {
>>>> +        void resetLocation() {
>>>>               rec.offset = undoLocation;
>>>>           }
>>>>
>>>>           /** Location to reset to when resetLocatino is invoked. */
>>>> -        protected int undoLocation;
>>>> +        private int undoLocation;
>>>>           /** Position to reset offset. */
>>>> -        protected PosRec rec;
>>>> +        private PosRec rec;
>>>>       }
>>>>
>>>>       /**
>>>>
>>



From victor.dyakov at oracle.com  Tue Aug 19 17:17:34 2014
From: victor.dyakov at oracle.com (Victor D'yakov)
Date: Tue, 19 Aug 2014 21:17:34 +0400
Subject: <Swing Dev> Another incarnation of the EventQueue NPE
In-Reply-To: <CACPuacu7Zz5fbKC84nhbw_SH_q0ChuEaaoobtybNvT3E_QwfXw@mail.gmail.com>
References: <CACPuacss=vTKu-1+JBYN1GFuVx_i3wxHMZ4gVbk5gMg_m2+caA@mail.gmail.com>
	<8583BE90-FF1D-45B0-9215-960C7CA9A2D4@oracle.com>
	<CACPuacu7Zz5fbKC84nhbw_SH_q0ChuEaaoobtybNvT3E_QwfXw@mail.gmail.com>
Message-ID: <53F386AE.2000601@oracle.com>

Hi Holger,

7u back port is filed [1] and we do address it to the one of the future 
7u update release, the exact release number will be chosen based on 
release timelines.

[1] https://bugs.openjdk.java.net/browse/JDK-8055398

Thanks,
Victor

On 18.04.2014 16:37, Holger Brands wrote:
> Hello again,
>
> JDK-8019274 appears to be fixed for 7u65 (-> JDK-8028290).
> Could someone check with access to a 7u65 build if that fixed the 
> issue described in this thread, too?
>
> It would be a pity, if this issue slips through and gets deferred yet 
> another few months...
>
> Thanks,
> Holger
>
>
>
> 2014-02-20 20:20 GMT+01:00 Petr Pchelko <petr.pchelko at oracle.com 
> <mailto:petr.pchelko at oracle.com>>:
>
>     Hello, Holger.
>
>     Thank you for the report.
>
>     The reason is that the ThreadPool is creating a thread in a
>     ThreadGroup which is not associated with any AppContext.
>     I suppose that the fix for JDK-8019274 would also resolve this
>     issue, but this should be checked. I?ll write back as I have a
>     chance to check this.
>
>     With best regards. Petr.
>
>     20 ????. 2014 ?., ? 11:01 ????? ???????, Holger Brands
>     <holger.brands at googlemail.com
>     <mailto:holger.brands at googlemail.com>> ???????(?):
>
>>     Hi there,
>>
>>     this is meant as a comment to issue
>>     https://bugs.openjdk.java.net/browse/JDK-8019274
>>     which describes a problem of RMI threads calling out to
>>     java.awt.EventQueue in a java webstart app.
>>
>>     I think it's a more general problem, not only related to RMI
>>     threads. Another scenario is the following:
>>     When you open a JFileChooser in a Java Webstart application,
>>     change the
>>     view to "Details" such that column headers appear and then click
>>     on the name column to sort the shown entries, I get the
>>     following exception on Windows 7, both with Java 7u45 and Java 7u51:
>>
>>     java.lang.NullPointerException
>>          at sun.awt.SunToolkit.getSystemEventQueueImplPP(Unknown Source)
>>          at sun.awt.SunToolkit.getSystemEventQueueImplPP(Unknown Source)
>>          at sun.awt.SunToolkit.getSystemEventQueueImpl(Unknown Source)
>>          at java.awt.Toolkit.getEventQueue(Unknown Source)
>>          at java.awt.EventQueue.isDispatchThread(Unknown Source)
>>          at javax.swing.SwingUtilities.isEventDispatchThread(Unknown
>>     Source)
>>          at javax.swing.JComponent.revalidate(Unknown Source)
>>          at javax.swing.JTable.resizeAndRepaint(Unknown Source)
>>          at javax.swing.JTable.sortedTableChanged(Unknown Source)
>>          at javax.swing.JTable.sorterChanged(Unknown Source)
>>          at javax.swing.RowSorter.fireRowSorterChanged(Unknown Source)
>>          at javax.swing.RowSorter.fireRowSorterChanged(Unknown Source)
>>          at javax.swing.DefaultRowSorter.sort(Unknown Source)
>>          at
>>     sun.swing.FilePane$DetailsTableRowSorter.access$1601(Unknown Source)
>>          at sun.swing.FilePane$DetailsTableRowSorter$1.call(Unknown
>>     Source)
>>          at sun.swing.FilePane$DetailsTableRowSorter$1.call(Unknown
>>     Source)
>>          at java.util.concurrent.FutureTask.run(Unknown Source)
>>          at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown
>>     Source)
>>          at
>>     java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
>>          at
>>     sun.awt.shell.Win32ShellFolderManager2$ComInvoker$3.run(Unknown
>>     Source)
>>          at java.lang.Thread.run(Unknown Source)
>>
>>     It's a similiar stacktrace but not quite the same.
>>     But I bet it's the same cause.
>>
>>     Please ensure when fixing JDK-8019274 that this variant is also
>>     fixed.
>>     Also, I would be interested in a workaround for this FileChooser
>>     sorting issue.
>>
>>     Thanks,
>>     Holger
>
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140819/3d31c11f/attachment.html>

From otaviojava at java.net  Wed Aug 20 01:05:58 2014
From: otaviojava at java.net (=?UTF-8?Q?Ot=C3=A1vio_Gon=C3=A7alves_de_Santana?=)
Date: Tue, 19 Aug 2014 22:05:58 -0300
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <53F36DF4.6000008@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
Message-ID: <CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>

Thank you Sergey.
https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_7.zip


On Tue, Aug 19, 2014 at 12:32 PM, Sergey Bylokhov <
Sergey.Bylokhov at oracle.com> wrote:

> Hi Ot?vio,
> The new alignment in DataLine.java/JColorChooser.java looks strange.
> Wrong change in BasicTableUI.java:
> -                    plainStr.deleteCharAt(plainStr.length() -
> 1).append("\n");
> +                    plainStr.deleteCharAt(plainStr.length() -
> 1).append('\t');
>
>
> On 13.08.2014 3:01, Ot?vio Gon?alves de Santana wrote:
>
>> Thank you Roger.
>> Done
>> https://dl.dropboxusercontent.com/u/16109193/open_jdk/
>> string_builder_concat_6.zip
>>
>>
>> On Tue, Aug 12, 2014 at 10:15 AM, roger riggs <roger.riggs at oracle.com>
>> wrote:
>>
>>  fyi,
>>>
>>> There's a Perl script normalizer.pl that detects/fixes most of the
>>> simple
>>> tab/white space issues.
>>> The script is in the <repo>/make/scripts/normalizer.pl
>>>
>>> Roger
>>>
>>>
>>> On 8/12/2014 3:48 AM, Andrej Golovnin wrote:
>>>
>>>  Hi Ot?vio,
>>>>
>>>> I think you should fix the indentation in a lot of classes. You use the
>>>> tab-character for the indentation. As far as I know we should use the
>>>> space
>>>> character for the indentation in the JDK sources (Oracle devs feel free
>>>> to
>>>> correct me if I'm wrong. And it would be really nice if the style guide
>>>> for
>>>> the source code would be a part of the JDK repository. So we don't need
>>>> to
>>>> search for it on the internet/wiki. Just clone the repository, read the
>>>> style guide and follow it. :-) ). Here is the not complete list of
>>>> classes
>>>> where you used the tab-character for the indentation:
>>>>
>>>> src/share/classes/com/sun/crypto/provider/OAEPParameters.java
>>>> src/share/classes/java/lang/management/MemoryUsage.java
>>>> src/share/classes/java/security/KeyStore.java
>>>> src/share/classes/java/security/PermissionCollection.java
>>>> src/share/classes/java/security/ProtectionDomain.java
>>>> src/share/classes/java/security/cert/CertPath.java
>>>> src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
>>>> src/share/classes/java/security/cert/PKIXParameters.java
>>>> src/share/classes/java/security/cert/PolicyQualifierInfo.java
>>>> src/share/classes/java/security/cert/TrustAnchor.java
>>>> src/share/classes/java/security/cert/X509CertSelector.java
>>>> src/share/classes/javax/crypto/CryptoPermission.java
>>>> src/share/classes/javax/management/relation/Role.java
>>>>
>>>>
>>>> In src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj in the line 423 a
>>>> dot
>>>> is missed before append:
>>>>
>>>> 423   {jjtn000.name.append( '.')append(t.image); }
>>>>
>>>> Best regards,
>>>> Andrej Golovnin
>>>>
>>>>
>>>
>>
>
> --
> Best regards, Sergey.
>
>


-- 
Ot?vio Gon?alves de Santana

blog:     http://otaviosantana.blogspot.com.br/
twitter: http://twitter.com/otaviojava
site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
55 (11) 98255-3513
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140819/04e2da68/attachment.html>
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/ThreadTab.java
--- a/src/share/classes/sun/tools/jconsole/ThreadTab.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/ThreadTab.java	Tue Aug 19 21:59:23 2014 -0300
@@ -368,7 +368,7 @@
                             sb.append(Messages.STACK_TRACE);
                             int index = 0;
                             for (StackTraceElement e : ti.getStackTrace()) {
-                                sb.append(e.toString()+"\n");
+                                sb.append(e.toString()).append('\n');
                                 if (monitors != null) {
                                     for (MonitorInfo mi : monitors) {
                                         if (mi.getLockedStackDepth() == index) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java	Tue Aug 19 21:59:23 2014 -0300
@@ -79,25 +79,25 @@
             String textColor = String.format("%06x",
                                              foreground.getRGB() & 0xFFFFFF);
             StringBuilder sb = new StringBuilder();
-            sb.append("<html><body text=#"+textColor+"><table width=\"100%\">");
+            sb.append("<html><body text=#").append(textColor).append("><table width=\"100%\">");
             for (int i = 0; i < arr.length; i++) {
                 if (i % 2 == 0) {
-                    sb.append("<tr style=\"background-color: " +
-                            evenRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(evenRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 } else {
-                    sb.append("<tr style=\"background-color: " +
-                            oddRowColorStr + "\"><td><pre>" +
-                            (arr[i] == null ?
-                                arr[i] : htmlize(arr[i].toString())) +
-                            "</pre></td></tr>");
+                    sb.append("<tr style=\"background-color: ")
+                            .append(oddRowColorStr).append("\"><td><pre>")
+                            .append(arr[i] == null ?
+                                    arr[i] : htmlize(arr[i].toString()))
+                            .append("</pre></td></tr>");
                 }
             }
             if (arr.length == 0) {
-                sb.append("<tr style=\"background-color: " +
-                        evenRowColorStr + "\"><td></td></tr>");
+				sb.append("<tr style=\"background-color: ")
+						.append(evenRowColorStr).append("\"><td></td></tr>");
             }
             sb.append("</table></body></html>");
             arrayEditor.setText(sb.toString());
diff -r dde9f5cfde5f src/share/classes/sun/tools/jconsole/inspector/XTree.java
--- a/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jconsole/inspector/XTree.java	Tue Aug 19 21:59:23 2014 -0300
@@ -507,13 +507,13 @@
         // key order defined by the "orderedKeyPropertyList"
         for (String key : orderedKeyPropertyList) {
             if (map.containsKey(key)) {
-                sb.append(key + "=" + map.get(key) + ",");
+                sb.append(key).append('=').append(map.get(key)).append(',');
                 map.remove(key);
             }
         }
         // Add the remaining key/value pairs to the buffer
         for (Map.Entry<String, String> entry : map.entrySet()) {
-            sb.append(entry.getKey() + "=" + entry.getValue() + ",");
+            sb.append(entry.getKey()).append('=').append(entry.getValue()).append(',');
         }
         String orderedKeyPropertyListString = sb.toString();
         orderedKeyPropertyListString = orderedKeyPropertyListString.substring(
@@ -622,7 +622,7 @@
                     //
                     StringBuilder sb = new StringBuilder();
                     for (MBeanParameterInfo mbpi : mboi.getSignature()) {
-                        sb.append(mbpi.getType() + ",");
+                        sb.append(mbpi.getType()).append(',');
                     }
                     String signature = sb.toString();
                     if (signature.length() > 0) {
diff -r dde9f5cfde5f src/share/classes/sun/tools/jps/Jps.java
--- a/src/share/classes/sun/tools/jps/Jps.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jps/Jps.java	Tue Aug 19 21:59:23 2014 -0300
@@ -92,28 +92,28 @@
                     vm = monitoredHost.getMonitoredVm(id, 0);
 
                     errorString = " -- main class information unavailable";
-                    output.append(" " + MonitoredVmUtil.mainClass(vm,
+                    output.append(' ').append(MonitoredVmUtil.mainClass(vm,
                             arguments.showLongPaths()));
 
                     if (arguments.showMainArgs()) {
                         errorString = " -- main args information unavailable";
                         String mainArgs = MonitoredVmUtil.mainArgs(vm);
                         if (mainArgs != null && mainArgs.length() > 0) {
-                            output.append(" " + mainArgs);
+                            output.append(' ').append(mainArgs);
                         }
                     }
                     if (arguments.showVmArgs()) {
                         errorString = " -- jvm args information unavailable";
                         String jvmArgs = MonitoredVmUtil.jvmArgs(vm);
                         if (jvmArgs != null && jvmArgs.length() > 0) {
-                          output.append(" " + jvmArgs);
+                          output.append(' ').append(jvmArgs);
                         }
                     }
                     if (arguments.showVmFlags()) {
                         errorString = " -- jvm flags information unavailable";
                         String jvmFlags = MonitoredVmUtil.jvmFlags(vm);
                         if (jvmFlags != null && jvmFlags.length() > 0) {
-                            output.append(" " + jvmFlags);
+                            output.append(' ').append(jvmFlags);
                         }
                     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/RawOutputFormatter.java
--- a/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/RawOutputFormatter.java	Tue Aug 19 21:59:23 2014 -0300
@@ -50,7 +50,7 @@
             StringBuilder headerBuilder = new StringBuilder();
             for (Iterator<Monitor> i = logged.iterator(); i.hasNext(); /* empty */ ) {
                 Monitor m = i.next();
-                headerBuilder.append(m.getName() + " ");
+                headerBuilder.append(m.getName()).append(' ');
             }
             header = headerBuilder.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/SyntaxException.java
--- a/src/share/classes/sun/tools/jstat/SyntaxException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/SyntaxException.java	Tue Aug 19 21:59:23 2014 -0300
@@ -65,7 +65,7 @@
     public SyntaxException(int lineno, Set<String> expected, Token found) {
         StringBuilder msg = new StringBuilder();
 
-        msg.append("Syntax error at line " + lineno + ": Expected one of \'");
+        msg.append("Syntax error at line ").append(lineno).append(": Expected one of \'");
 
         boolean first = true;
         for (Iterator<String> i = expected.iterator(); i.hasNext(); /* empty */) {
@@ -74,11 +74,11 @@
                 msg.append(keyWord);
                 first = false;
             } else {
-                msg.append("|" + keyWord);
+                msg.append('|').append(keyWord);
             }
         }
 
-        msg.append("\', Found " + found.toMessage());
+        msg.append("\', Found ").append(found.toMessage());
         message = msg.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstat/Token.java
--- a/src/share/classes/sun/tools/jstat/Token.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstat/Token.java	Tue Aug 19 21:59:23 2014 -0300
@@ -89,18 +89,18 @@
             sb.append("ttype=TT_EOF");
             break;
         case StreamTokenizer.TT_NUMBER:
-            sb.append("ttype=TT_NUM,").append("nval="+nval);
+            sb.append("ttype=TT_NUM,").append("nval=").append(nval);
             break;
         case StreamTokenizer.TT_WORD:
             if (sval == null) {
                 sb.append("ttype=TT_WORD:IDENTIFIER");
             } else {
-                sb.append("ttype=TT_WORD:").append("sval="+sval);
+                sb.append("ttype=TT_WORD:").append("sval=").append(sval);
             }
             break;
         default:
             if (ttype == (int)'"') {
-                sb.append("ttype=TT_STRING:").append("sval="+sval);
+                sb.append("ttype=TT_STRING:").append("sval=").append(sval);
             } else {
                 sb.append("ttype=TT_CHAR:").append((char)ttype);
             }
diff -r dde9f5cfde5f src/share/classes/sun/tools/jstatd/RemoteHostImpl.java
--- a/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java	Tue Aug 19 21:59:23 2014 -0300
@@ -68,7 +68,7 @@
 
         sb.append("local://").append(lvmid).append("@localhost");
         if (mode != null) {
-            sb.append("?mode=" + mode);
+            sb.append("?mode=").append(mode);
         }
 
         String vmidStr = sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/security/acl/AclEntryImpl.java
--- a/src/share/classes/sun/security/acl/AclEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/acl/AclEntryImpl.java	Tue Aug 19 21:59:23 2014 -0300
@@ -137,26 +137,30 @@
     /**
      * Return a string representation of  the contents of the ACL entry.
      */
-    public String toString() {
-        StringBuffer s = new StringBuffer();
-        if (negative)
-          s.append("-");
-        else
-          s.append("+");
-        if (user instanceof Group)
-            s.append("Group.");
-        else
-            s.append("User.");
-        s.append(user + "=");
-        Enumeration<Permission> e = permissions();
-        while(e.hasMoreElements()) {
-            Permission p = e.nextElement();
-            s.append(p);
-            if (e.hasMoreElements())
-                s.append(",");
-        }
-        return new String(s);
-    }
+	public String toString() {
+		StringBuffer sb = new StringBuffer();
+		if (negative) {
+			sb.append('-');
+		} else {
+			sb.append('+');
+		}
+		if (user instanceof Group) {
+			sb.append("Group.");
+		} else {
+			sb.append("User.");
+		}
+		sb.append(user).append('=');
+
+		Enumeration<Permission> e = permissions();
+		while (e.hasMoreElements()) {
+			Permission p = e.nextElement();
+			sb.append(p);
+			if (e.hasMoreElements()) {
+				sb.append(',');
+			}
+		}
+		return sb.toString();
+	}
 
     /**
      * Clones an AclEntry.
diff -r dde9f5cfde5f src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
--- a/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java	Tue Aug 19 21:59:23 2014 -0300
@@ -640,8 +640,7 @@
 
         for (int i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
--- a/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java	Tue Aug 19 21:59:23 2014 -0300
@@ -158,8 +158,8 @@
         }
         sb.append(hexDumper.encode(certHash));
         if (issuer != null && serialNumber != null) {
-            sb.append("\n\tIssuer: " + issuer + "\n");
-            sb.append("\t" + serialNumber);
+            sb.append("\n\tIssuer: ").append(issuer).append('\n');
+            sb.append('\t').append(serialNumber);
         }
         sb.append("\n]");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/pkcs11/P11KeyStore.java
--- a/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/pkcs11/P11KeyStore.java	Tue Aug 19 21:59:23 2014 -0300
@@ -196,24 +196,24 @@
             } else if (type == ATTR_CLASS_CERT) {
                 sb.append("\ttype=[trusted cert]\n");
             }
-            sb.append("\tlabel=[" + label + "]\n");
+            sb.append("\tlabel=[").append(label).append("]\n");
             if (id == null) {
                 sb.append("\tid=[null]\n");
             } else {
-                sb.append("\tid=" + P11KeyStore.getID(id) + "\n");
+                sb.append("\tid=").append(P11KeyStore.getID(id)).append('\n');
             }
-            sb.append("\ttrusted=[" + trusted + "]\n");
-            sb.append("\tmatched=[" + matched + "]\n");
+            sb.append("\ttrusted=[").append(trusted).append("]\n");
+            sb.append("\tmatched=[").append(matched).append("]\n");
             if (cert == null) {
                 sb.append("\tcert=[null]\n");
             } else {
-                sb.append("\tcert=[\tsubject: " +
-                        cert.getSubjectX500Principal() +
-                        "\n\t\tissuer: " +
-                        cert.getIssuerX500Principal() +
-                        "\n\t\tserialNum: " +
-                        cert.getSerialNumber().toString() +
-                        "]");
+                sb.append("\tcert=[\tsubject: ")
+                        .append(cert.getSubjectX500Principal())
+                        .append("\n\t\tissuer: ")
+                        .append(cert.getIssuerX500Principal())
+                        .append("\n\t\tserialNum: ")
+                        .append(cert.getSerialNumber().toString())
+                        .append(']');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/PolicyFile.java
--- a/src/share/classes/sun/security/provider/PolicyFile.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/PolicyFile.java	Tue Aug 19 21:59:23 2014 -0300
@@ -1485,30 +1485,30 @@
         }
         int startIndex = 0;
         int v;
-        StringBuilder sb = new StringBuilder();
-        while ((v = sp.getSelfName().indexOf(SELF, startIndex)) != -1) {
+		StringBuilder sb = new StringBuilder();
+		while ((v = sp.getSelfName().indexOf(SELF, startIndex)) != -1) {
 
-            // add non-SELF string
-            sb.append(sp.getSelfName().substring(startIndex, v));
+			// add non-SELF string
+			sb.append(sp.getSelfName().substring(startIndex, v));
 
-            // expand SELF
-            Iterator<PolicyParser.PrincipalEntry> pli = entryPs.iterator();
-            while (pli.hasNext()) {
-                PolicyParser.PrincipalEntry pppe = pli.next();
-                String[][] principalInfo = getPrincipalInfo(pppe,pdp);
-                for (int i = 0; i < principalInfo.length; i++) {
-                    if (i != 0) {
-                        sb.append(", ");
-                    }
-                    sb.append(principalInfo[i][0] + " " +
-                        "\"" + principalInfo[i][1] + "\"");
-                }
-                if (pli.hasNext()) {
-                    sb.append(", ");
-                }
-            }
-            startIndex = v + SELF.length();
-        }
+			// expand SELF
+			Iterator<PolicyParser.PrincipalEntry> pli = entryPs.iterator();
+			while (pli.hasNext()) {
+				PolicyParser.PrincipalEntry pppe = pli.next();
+				String[][] principalInfo = getPrincipalInfo(pppe, pdp);
+				for (int i = 0; i < principalInfo.length; i++) {
+					if (i != 0) {
+						sb.append(", ");
+					}
+					sb.append(principalInfo[i][0]).append(' ').append('"')
+							.append(principalInfo[i][1]).append('"');
+				}
+				if (pli.hasNext()) {
+					sb.append(", ");
+				}
+			}
+			startIndex = v + SELF.length();
+		}
         // add remaining string (might be the entire string)
         sb.append(sp.getSelfName().substring(startIndex));
 
@@ -1774,17 +1774,17 @@
         Principal[] principals = pd.getPrincipals();
         String pals = "<no principals>";
         if (principals != null && principals.length > 0) {
-            StringBuilder palBuf = new StringBuilder("(principals ");
+            StringBuilder palSB = new StringBuilder("(principals ");
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                              " \"" + principals[i].getName() +
-                              "\"");
+                palSB.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append('"');
                 if (i < principals.length-1)
-                    palBuf.append(", ");
+                    palSB.append(", ");
                 else
-                    palBuf.append(")");
+                    palSB.append(')');
             }
-            pals = palBuf.toString();
+            pals = palSB.toString();
         }
         return "PD CodeSource: "
                 + pd.getCodeSource()
@@ -1884,7 +1884,7 @@
                     throw new Exception(form.format(source));
                 }
 
-                sb.append(X500PRINCIPAL + " \"" + suffix + "\"");
+                sb.append(X500PRINCIPAL).append(" \"").append(suffix).append('"');
                 startIndex = e+2;
             } else {
                 MessageFormat form = new MessageFormat
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/CertId.java
--- a/src/share/classes/sun/security/provider/certpath/CertId.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/CertId.java	Tue Aug 19 21:59:23 2014 -0300
@@ -223,13 +223,13 @@
     @Override public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CertId \n");
-        sb.append("Algorithm: " + hashAlgId.toString() +"\n");
+        sb.append("Algorithm: ").append(hashAlgId.toString()).append('\n');
         sb.append("issuerNameHash \n");
         HexDumpEncoder encoder = new HexDumpEncoder();
         sb.append(encoder.encode(issuerNameHash));
         sb.append("\nissuerKeyHash: \n");
         sb.append(encoder.encode(issuerKeyHash));
-        sb.append("\n" +  certSerialNumber.toString());
+        sb.append('\n').append(certSerialNumber.toString());
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/OCSPResponse.java
--- a/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Aug 19 21:59:23 2014 -0300
@@ -812,14 +812,14 @@
             StringBuilder sb = new StringBuilder();
             sb.append("SingleResponse:  \n");
             sb.append(certId);
-            sb.append("\nCertStatus: "+ certStatus + "\n");
+            sb.append("\nCertStatus: ").append(certStatus).append('\n');
             if (certStatus == CertStatus.REVOKED) {
-                sb.append("revocationTime is " + revocationTime + "\n");
-                sb.append("revocationReason is " + revocationReason + "\n");
+                sb.append("revocationTime is ").append(revocationTime).append('\n');
+                sb.append("revocationReason is ").append(revocationReason).append('\n');
             }
-            sb.append("thisUpdate is " + thisUpdate + "\n");
+            sb.append("thisUpdate is ").append(thisUpdate).append('\n');
             if (nextUpdate != null) {
-                sb.append("nextUpdate is " + nextUpdate + "\n");
+                sb.append("nextUpdate is ").append(nextUpdate).append('\n');
             }
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
--- a/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java	Tue Aug 19 21:59:23 2014 -0300
@@ -124,7 +124,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Build Forward Flag: " + String.valueOf(buildForward) + "\n");
+        sb.append("  Build Forward Flag: ").append(String.valueOf(buildForward)).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/HandshakeMessage.java
--- a/src/share/classes/sun/security/ssl/HandshakeMessage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/HandshakeMessage.java	Tue Aug 19 21:59:23 2014 -0300
@@ -1478,7 +1478,7 @@
                 boolean opened = false;
                 for (SignatureAndHashAlgorithm signAlg : algorithms) {
                     if (opened) {
-                        sb.append(", " + signAlg.getAlgorithmName());
+                        sb.append(", ").append(signAlg.getAlgorithmName());
                     } else {
                         sb.append(signAlg.getAlgorithmName());
                         opened = true;
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/ServerNameExtension.java
--- a/src/share/classes/sun/security/ssl/ServerNameExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/ServerNameExtension.java	Tue Aug 19 21:59:23 2014 -0300
@@ -267,11 +267,11 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
+        sb.append("Extension ").append(type).append(", server_name: ");
         for (SNIServerName sniName : sniMap.values()) {
-            sb.append("[" + sniName + "]");
+            sb.append('[').append(sniName).append(']');
         }
-
-        return "Extension " + type + ", server_name: " + sb;
+        return sb.toString();
     }
 
     private static class UnknownServerName extends SNIServerName {
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
--- a/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java	Tue Aug 19 21:59:23 2014 -0300
@@ -119,17 +119,17 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
+        sb.append("Extension ").append(type).append(", signature_algorithms: ");
         boolean opened = false;
         for (SignatureAndHashAlgorithm signAlg : algorithms) {
             if (opened) {
-                sb.append(", " + signAlg.getAlgorithmName());
+                sb.append(", ").append(signAlg.getAlgorithmName());
             } else {
                 sb.append(signAlg.getAlgorithmName());
                 opened = true;
             }
         }
-
-        return "Extension " + type + ", signature_algorithms: " + sb;
+        return  sb.toString();
     }
 }
 
diff -r dde9f5cfde5f src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
--- a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Aug 19 21:59:23 2014 -0300
@@ -112,37 +112,37 @@
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Extension " + type + ", curve names: {");
-        boolean first = true;
-        for (int curveId : curveIds) {
-            if (first) {
-                first = false;
-            } else {
-                sb.append(", ");
-            }
-            // first check if it is a known named curve, then try other cases.
-            String oid = getCurveOid(curveId);
-            if (oid != null) {
-                ECParameterSpec spec = JsseJce.getECParameterSpec(oid);
-                // this toString() output will look nice for the current
-                // implementation of the ECParameterSpec class in the Sun
-                // provider, but may not look good for other implementations.
-                if (spec != null) {
-                    sb.append(spec.toString().split(" ")[0]);
-                } else {
-                    sb.append(oid);
-                }
-            } else if (curveId == ARBITRARY_PRIME) {
-                sb.append("arbitrary_explicit_prime_curves");
-            } else if (curveId == ARBITRARY_CHAR2) {
-                sb.append("arbitrary_explicit_char2_curves");
-            } else {
-                sb.append("unknown curve " + curveId);
-            }
-        }
-        sb.append("}");
-        return sb.toString();
+		StringBuilder sb = new StringBuilder();
+		sb.append("Extension ").append(type).append(", curve names: {");
+		boolean first = true;
+		for (int curveId : curveIds) {
+			if (first) {
+				first = false;
+			} else {
+				sb.append(", ");
+			}
+			// first check if it is a known named curve, then try other cases.
+			String oid = getCurveOid(curveId);
+			if (oid != null) {
+				ECParameterSpec spec = JsseJce.getECParameterSpec(oid);
+				// this toString() output will look nice for the current
+				// implementation of the ECParameterSpec class in the Sun
+				// provider, but may not look good for other implementations.
+				if (spec != null) {
+					sb.append(spec.toString().split(" ")[0]);
+				} else {
+					sb.append(oid);
+				}
+			} else if (curveId == ARBITRARY_PRIME) {
+				sb.append("arbitrary_explicit_prime_curves");
+			} else if (curveId == ARBITRARY_CHAR2) {
+				sb.append("arbitrary_explicit_char2_curves");
+			} else {
+				sb.append("unknown curve ").append(curveId);
+			}
+		}
+		sb.append("}");
+		return sb.toString();
     }
 
     // Test whether we support the curve with the given index.
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/jarsigner/Main.java
--- a/src/share/classes/sun/security/tools/jarsigner/Main.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/jarsigner/Main.java	Tue Aug 19 21:59:23 2014 -0300
@@ -676,14 +676,13 @@
                             ((man.getAttributes(name) != null) ||
                              (man.getAttributes("./"+name) != null) ||
                              (man.getAttributes("/"+name) != null));
-                        sb.append(
-                          (isSigned ? rb.getString("s") : rb.getString("SPACE")) +
-                          (inManifest ? rb.getString("m") : rb.getString("SPACE")) +
-                          (inStore ? rb.getString("k") : rb.getString("SPACE")) +
-                          (inScope ? rb.getString("i") : rb.getString("SPACE")) +
-                          ((inStoreOrScope & NOT_ALIAS) != 0 ?"X":" ") +
-                          rb.getString("SPACE"));
-                        sb.append("|");
+                        sb.append(isSigned ? rb.getString("s") : rb.getString("SPACE"))
+                                .append(inManifest ? rb.getString("m") : rb.getString("SPACE"))
+                                .append(inStore ? rb.getString("k") : rb.getString("SPACE"))
+                                .append(inScope ? rb.getString("i") : rb.getString("SPACE"))
+                                .append((inStoreOrScope & NOT_ALIAS) != 0 ? 'X' : ' ')
+                                .append(rb.getString("SPACE"));
+                        sb.append('|');
                     }
 
                     // When -certs provided, display info has extra empty
@@ -704,11 +703,13 @@
                         // Print no info for unsigned entries when -verbose:all,
                         // to be consistent with old behavior.
                         if (signatureRelated(name)) {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Signature.related.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(
+                            		rb.getString(".Signature.related.entries."))
+                            		.append("\n\n");
                         } else {
-                            sb.append("\n" + tab + rb.getString(
-                                    ".Unsigned.entries.") + "\n\n");
+                            sb.append('\n').append(tab).append(
+                            		rb.getString(".Unsigned.entries."))
+                            		.append("\n\n");
                         }
                     }
 
@@ -1605,8 +1606,8 @@
                 // No more warning, we alreay have hasExpiredCert or notYetValidCert
             } else {
                 chainNotValidated = true;
-                sb.append(tab + rb.getString(".CertPath.not.validated.") +
-                        e.getLocalizedMessage() + "]\n");   // TODO
+                sb.append(tab).append(rb.getString(".CertPath.not.validated."))
+                        .append(e.getLocalizedMessage()).append("]\n");   // TODO
             }
         }
         String result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/tools/policytool/PolicyTool.java
--- a/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/tools/policytool/PolicyTool.java	Tue Aug 19 21:59:23 2014 -0300
@@ -980,8 +980,9 @@
                                 grantEntry.principals.listIterator();
             while (list.hasNext()) {
                 PolicyParser.PrincipalEntry pppe = list.next();
-                sb.append(" Principal " + pppe.getDisplayClass() + " " +
-                    pppe.getDisplayName(true));
+                sb.append(" Principal ").append(pppe.getDisplayClass())
+                        .append(' ')
+                        .append(pppe.getDisplayName(true));
                 if (list.hasNext()) sb.append(", ");
             }
             result = sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/AVA.java
--- a/src/share/classes/sun/security/x509/AVA.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/AVA.java	Tue Aug 19 21:59:23 2014 -0300
@@ -1062,7 +1062,7 @@
             } else {
 
                 boolean quoteNeeded = false;
-                StringBuilder sbuffer = new StringBuilder();
+                StringBuilder sb = new StringBuilder();
                 boolean previousWhite = false;
                 final String escapees = ",+=\n<>#;\\\"";
 
@@ -1079,7 +1079,7 @@
                 for (int i = 0; i < length; i++) {
                     char c = valStr.charAt(i);
                     if (alreadyQuoted && (i == 0 || i == length - 1)) {
-                        sbuffer.append(c);
+                        sb.append(c);
                         continue;
                     }
                     if (DerValue.isPrintableStringChar(c) ||
@@ -1096,7 +1096,7 @@
                         if (!(c == ' ' || c == '\n')) {
                             // escape '"' and '\'
                             if (c == '"' || c == '\\') {
-                                sbuffer.append('\\');
+                                sb.append('\\');
                             }
                             previousWhite = false;
                         } else {
@@ -1106,7 +1106,7 @@
                             previousWhite = true;
                         }
 
-                        sbuffer.append(c);
+                        sb.append(c);
 
                     } else if (debug != null && Debug.isOn("ava")) {
 
@@ -1119,26 +1119,26 @@
                         byte[] valueBytes =
                                 Character.toString(c).getBytes("UTF8");
                         for (int j = 0; j < valueBytes.length; j++) {
-                            sbuffer.append('\\');
+                            sb.append('\\');
                             char hexChar = Character.forDigit
                                         (0xF & (valueBytes[j] >>> 4), 16);
-                            sbuffer.append(Character.toUpperCase(hexChar));
+                            sb.append(Character.toUpperCase(hexChar));
                             hexChar = Character.forDigit
                                         (0xF & (valueBytes[j]), 16);
-                            sbuffer.append(Character.toUpperCase(hexChar));
+                            sb.append(Character.toUpperCase(hexChar));
                         }
                     } else {
 
                         // append non-printable/non-escaped char
 
                         previousWhite = false;
-                        sbuffer.append(c);
+                        sb.append(c);
                     }
                 }
 
                 // quote if trailing whitespace
-                if (sbuffer.length() > 0) {
-                    char trailChar = sbuffer.charAt(sbuffer.length() - 1);
+                if (sb.length() > 0) {
+                    char trailChar = sb.charAt(sb.length() - 1);
                     if (trailChar == ' ' || trailChar == '\n') {
                         quoteNeeded = true;
                     }
@@ -1147,9 +1147,9 @@
                 // Emit the string ... quote it if needed
                 // if string is already quoted, don't re-quote
                 if (!alreadyQuoted && quoteNeeded) {
-                    retval.append("\"" + sbuffer.toString() + "\"");
+                    retval.append('"').append(sb.toString()).append('"');
                 } else {
-                    retval.append(sbuffer.toString());
+                    retval.append(sb.toString());
                 }
             }
         } catch (IOException e) {
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPoint.java
--- a/src/share/classes/sun/security/x509/DistributionPoint.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPoint.java	Tue Aug 19 21:59:23 2014 -0300
@@ -381,22 +381,22 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPoint:\n     " + fullName + "\n");
+            sb.append("DistributionPoint:\n     ").append(fullName).append('\n');
         }
         if (relativeName != null) {
-            sb.append("DistributionPoint:\n     " + relativeName + "\n");
+            sb.append("DistributionPoint:\n     ").append(relativeName).append('\n');
         }
 
         if (reasonFlags != null) {
             sb.append("   ReasonFlags:\n");
             for (int i = 0; i < reasonFlags.length; i++) {
                 if (reasonFlags[i]) {
-                    sb.append("    " + reasonToString(i) + "\n");
+                    sb.append("    ").append(reasonToString(i)).append('\n');
                 }
             }
         }
         if (crlIssuer != null) {
-            sb.append("   CRLIssuer:" + crlIssuer + "\n");
+            sb.append("   CRLIssuer:").append(crlIssuer).append('\n');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/DistributionPointName.java
--- a/src/share/classes/sun/security/x509/DistributionPointName.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/DistributionPointName.java	Tue Aug 19 21:59:23 2014 -0300
@@ -231,10 +231,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (fullName != null) {
-            sb.append("DistributionPointName:\n     " + fullName + "\n");
+            sb.append("DistributionPointName:\n     ").append(fullName).append('\n');
 
         } else {
-            sb.append("DistributionPointName:\n     " + relativeName + "\n");
+            sb.append("DistributionPointName:\n     ").append(relativeName).append('\n');
         }
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/PolicyInformation.java
--- a/src/share/classes/sun/security/x509/PolicyInformation.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/PolicyInformation.java	Tue Aug 19 21:59:23 2014 -0300
@@ -258,9 +258,9 @@
      * Return a printable representation of the PolicyInformation.
      */
     public String toString() {
-        StringBuilder s = new StringBuilder("  [" + policyIdentifier.toString());
-        s.append(policyQualifiers + "  ]\n");
-        return s.toString();
+        StringBuilder sb = new StringBuilder("  [" + policyIdentifier.toString());
+        sb.append(policyQualifiers).append("  ]\n");
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLEntryImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	Tue Aug 19 21:59:23 2014 -0300
@@ -292,17 +292,17 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append(serialNumber.toString());
-        sb.append("  On: " + revocationDate.toString());
+        sb.append("  On: ").append(revocationDate.toString());
         if (certIssuer != null) {
-            sb.append("\n    Certificate issuer: " + certIssuer);
+            sb.append("\n    Certificate issuer: ").append(certIssuer);
         }
         if (extensions != null) {
             Collection<Extension> allEntryExts = extensions.getAllExtensions();
             Extension[] exts = allEntryExts.toArray(new Extension[0]);
 
-            sb.append("\n    CRL Entry Extensions: " + exts.length);
+            sb.append("\n    CRL Entry Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n    [" + (i+1) + "]: ");
+                sb.append("\n    [").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -313,9 +313,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CRLImpl.java
--- a/src/share/classes/sun/security/x509/X509CRLImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CRLImpl.java	Tue Aug 19 21:59:23 2014 -0300
@@ -537,31 +537,32 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("X.509 CRL v" + (version+1) + "\n");
+        sb.append("X.509 CRL v").append(version + 1).append('\n');
         if (sigAlgId != null)
-            sb.append("Signature Algorithm: " + sigAlgId.toString() +
-                  ", OID=" + (sigAlgId.getOID()).toString() + "\n");
+            sb.append("Signature Algorithm: ").append(sigAlgId.toString())
+                    .append(", OID=")
+                    .append((sigAlgId.getOID()).toString()).append('\n');
         if (issuer != null)
-            sb.append("Issuer: " + issuer.toString() + "\n");
+            sb.append("Issuer: ").append(issuer.toString()).append('\n');
         if (thisUpdate != null)
-            sb.append("\nThis Update: " + thisUpdate.toString() + "\n");
+            sb.append("\nThis Update: ").append(thisUpdate.toString()).append('\n');
         if (nextUpdate != null)
-            sb.append("Next Update: " + nextUpdate.toString() + "\n");
+            sb.append("Next Update: ").append(nextUpdate.toString()).append('\n');
         if (revokedList.isEmpty())
             sb.append("\nNO certificates have been revoked\n");
         else {
-            sb.append("\nRevoked Certificates: " + revokedList.size());
+            sb.append("\nRevoked Certificates: ").append(revokedList.size());
             int i = 1;
             for (X509CRLEntry entry: revokedList) {
-                sb.append("\n[" + i++ + "] " + entry.toString());
+                sb.append("\n[").append(i++).append("] ").append(entry.toString());
             }
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Object[] objs = allExts.toArray();
-            sb.append("\nCRL Extensions: " + objs.length);
+            sb.append("\nCRL Extensions: ").append(objs.length);
             for (int i = 0; i < objs.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = (Extension)objs[i];
                 try {
                    if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -572,9 +573,8 @@
                            out.putOctetString(extValue);
                            extValue = out.toByteArray();
                            HexDumpEncoder enc = new HexDumpEncoder();
-                           sb.append("Extension unknown: "
-                                     + "DER encoded OCTET string =\n"
-                                     + enc.encodeBuffer(extValue) + "\n");
+                           sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                   .append(enc.encodeBuffer(extValue)).append('\n');
                       }
                    } else
                        sb.append(ext.toString()); // sub-class exists
@@ -585,8 +585,7 @@
         }
         if (signature != null) {
             HexDumpEncoder encoder = new HexDumpEncoder();
-            sb.append("\nSignature:\n" + encoder.encodeBuffer(signature)
-                      + "\n");
+            sb.append("\nSignature:\n").append(encoder.encodeBuffer(signature)).append('\n');
         } else
             sb.append("NOT signed yet\n");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertImpl.java
--- a/src/share/classes/sun/security/x509/X509CertImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertImpl.java	Tue Aug 19 21:59:23 2014 -0300
@@ -802,11 +802,11 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append(info.toString() + "\n");
-        sb.append("  Algorithm: [" + algId.toString() + "]\n");
+        sb.append(info.toString()).append('\n');
+        sb.append("  Algorithm: [").append(algId.toString()).append("]\n");
 
         HexDumpEncoder encoder = new HexDumpEncoder();
-        sb.append("  Signature:\n" + encoder.encodeBuffer(signature));
+        sb.append("  Signature:\n").append(encoder.encodeBuffer(signature));
         sb.append("\n]");
 
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/sun/security/x509/X509CertInfo.java
--- a/src/share/classes/sun/security/x509/X509CertInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/security/x509/X509CertInfo.java	Tue Aug 19 21:59:23 2014 -0300
@@ -298,27 +298,27 @@
         StringBuilder sb = new StringBuilder();
 
         sb.append("[\n");
-        sb.append("  " + version.toString() + "\n");
-        sb.append("  Subject: " + subject.toString() + "\n");
-        sb.append("  Signature Algorithm: " + algId.toString() + "\n");
-        sb.append("  Key:  " + pubKey.toString() + "\n");
-        sb.append("  " + interval.toString() + "\n");
-        sb.append("  Issuer: " + issuer.toString() + "\n");
-        sb.append("  " + serialNum.toString() + "\n");
+        sb.append("  ").append(version.toString()).append('\n');
+        sb.append("  Subject: ").append(subject.toString()).append('\n');
+        sb.append("  Signature Algorithm: ").append(algId.toString()).append('\n');
+        sb.append("  Key:  ").append(pubKey.toString()).append('\n');
+        sb.append("  ").append(interval.toString()).append('\n');
+        sb.append("  Issuer: ").append(issuer.toString()).append('\n');
+        sb.append("  ").append(serialNum.toString()).append('\n');
 
         // optional v2, v3 extras
         if (issuerUniqueId != null) {
-            sb.append("  Issuer Id:\n" + issuerUniqueId.toString() + "\n");
+            sb.append("  Issuer Id:\n").append(issuerUniqueId.toString()).append('\n');
         }
         if (subjectUniqueId != null) {
-            sb.append("  Subject Id:\n" + subjectUniqueId.toString() + "\n");
+            sb.append("  Subject Id:\n").append(subjectUniqueId.toString()).append('\n');
         }
         if (extensions != null) {
             Collection<Extension> allExts = extensions.getAllExtensions();
             Extension[] exts = allExts.toArray(new Extension[0]);
-            sb.append("\nCertificate Extensions: " + exts.length);
+            sb.append("\nCertificate Extensions: ").append(exts.length);
             for (int i = 0; i < exts.length; i++) {
-                sb.append("\n[" + (i+1) + "]: ");
+                sb.append("\n[").append(i + 1).append("]: ");
                 Extension ext = exts[i];
                 try {
                     if (OIDMap.getClass(ext.getExtensionId()) == null) {
@@ -329,9 +329,8 @@
                             out.putOctetString(extValue);
                             extValue = out.toByteArray();
                             HexDumpEncoder enc = new HexDumpEncoder();
-                            sb.append("Extension unknown: "
-                                      + "DER encoded OCTET string =\n"
-                                      + enc.encodeBuffer(extValue) + "\n");
+                            sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
+                                    .append(enc.encodeBuffer(extValue)).append('\n');
                         }
                     } else
                         sb.append(ext.toString()); //sub-class exists
@@ -341,10 +340,10 @@
             }
             Map<String,Extension> invalid = extensions.getUnparseableExtensions();
             if (invalid.isEmpty() == false) {
-                sb.append("\nUnparseable certificate extensions: " + invalid.size());
+                sb.append("\nUnparseable certificate extensions: ").append(invalid.size());
                 int i = 1;
                 for (Extension ext : invalid.values()) {
-                    sb.append("\n[" + (i++) + "]: ");
+                    sb.append("\n[").append(i++).append("]: ");
                     sb.append(ext);
                 }
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
--- a/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	Tue Aug 19 21:59:23 2014 -0300
@@ -463,12 +463,12 @@
 
     // ---------
 
-    private static void appendIfLiteralAddress(String addr, StringBuffer sb) {
+    private static void appendIfLiteralAddress(String addr, StringBuilder sb) {
         if (IPAddressUtil.isIPv4LiteralAddress(addr)) {
-            sb.append("dns://" + addr + " ");
+            sb.append("dns://").append(addr).append(' ');
         } else {
             if (IPAddressUtil.isIPv6LiteralAddress(addr)) {
-                sb.append("dns://[" + addr + "] ");
+                sb.append("dns://[").append(addr).append("] ");
             }
         }
     }
@@ -478,7 +478,7 @@
      *         corresponding to the supplied List of nameservers.
      */
     private static String createProviderURL(List<String> nsList) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (String s: nsList) {
             appendIfLiteralAddress(s, sb);
         }
@@ -491,7 +491,7 @@
      *         contained in the provided str.
      */
     private static String createProviderURL(String str) {
-        StringBuffer sb = new StringBuffer();
+    	StringBuilder sb = new StringBuilder();
         StringTokenizer st = new StringTokenizer(str, ",");
         while (st.hasMoreTokens()) {
             appendIfLiteralAddress(st.nextToken(), sb);
diff -r dde9f5cfde5f src/share/classes/sun/net/www/HeaderParser.java
--- a/src/share/classes/sun/net/www/HeaderParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/HeaderParser.java	Tue Aug 19 21:59:23 2014 -0300
@@ -220,21 +220,23 @@
 
     public String toString () {
         Iterator<String> k = keys();
-        StringBuffer sbuf = new StringBuffer();
-        sbuf.append ("{size="+asize+" nkeys="+nkeys+" ");
+        StringBuilder sb = new StringBuilder();
+		sb.append("{size=").append(asize).append(" nkeys=").append(nkeys)
+				.append(' ');
         for (int i=0; k.hasNext(); i++) {
             String key = k.next();
             String val = findValue (i);
             if (val != null && "".equals (val)) {
                 val = null;
             }
-            sbuf.append (" {"+key+(val==null?"":","+val)+"}");
+			sb.append(" {").append(key).append(val == null ? "" : "," + val)
+					.append('}');
             if (k.hasNext()) {
-                sbuf.append (",");
+                sb.append (',');
             }
         }
-        sbuf.append (" }");
-        return new String (sbuf);
+        sb.append (" }");
+        return new String (sb);
     }
 
     public int findInt(String k, int Default) {
diff -r dde9f5cfde5f src/share/classes/sun/net/www/MimeEntry.java
--- a/src/share/classes/sun/net/www/MimeEntry.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/net/www/MimeEntry.java	Tue Aug 19 21:59:23 2014 -0300
@@ -288,7 +288,7 @@
 
         int action = getAction();
         if (action != MimeEntry.UNKNOWN) {
-            sb.append("action=" + actionKeywords[action]);
+            sb.append("action=").append(actionKeywords[action]);
             needSeparator = true;
         }
 
@@ -297,7 +297,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("application=" + command);
+            sb.append("application=").append(command);
             needSeparator = true;
         }
 
@@ -305,7 +305,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("icon=" + getImageFileName());
+            sb.append("icon=").append(getImageFileName());
             needSeparator = true;
         }
 
@@ -314,7 +314,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("file_extensions=" + extensions);
+            sb.append("file_extensions=").append(extensions);
             needSeparator = true;
         }
 
@@ -323,7 +323,7 @@
             if (needSeparator) {
                 sb.append(separator);
             }
-            sb.append("description=" + description);
+            sb.append("description=").append(description);
         }
 
         return sb.toString();
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/management/Agent.java
--- a/src/share/classes/sun/management/Agent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/Agent.java	Tue Aug 19 21:59:23 2014 -0300
@@ -502,7 +502,7 @@
         } else {
             StringBuilder message = new StringBuilder(params[0]);
             for (int i = 1; i < params.length; i++) {
-                message.append(" " + params[i]);
+                message.append(' ').append(params[i]);
             }
             error(key, message.toString());
         }
diff -r dde9f5cfde5f src/share/classes/sun/management/MappedMXBeanType.java
--- a/src/share/classes/sun/management/MappedMXBeanType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/management/MappedMXBeanType.java	Tue Aug 19 21:59:23 2014 -0300
@@ -289,7 +289,7 @@
             if (et.isPrimitive()) {
                 className = new StringBuilder(c.getName());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
@@ -385,7 +385,7 @@
             if (elementType instanceof Class && ((Class) elementType).isPrimitive()) {
                 className = new StringBuilder(gat.toString());
             } else {
-                className.append("L" + baseElementType.getTypeName() + ";");
+                className.append('L').append(baseElementType.getTypeName()).append(';');
             }
             try {
                 mappedTypeClass = Class.forName(className.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/launcher/LauncherHelper.java
--- a/src/share/classes/sun/launcher/LauncherHelper.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/launcher/LauncherHelper.java	Tue Aug 19 21:59:23 2014 -0300
@@ -369,10 +369,9 @@
     static void appendVmErgoMessage(boolean isServerClass, String vm) {
         outBuf = outBuf.append(getLocalizedMessage("java.launcher.ergo.message1",
                 vm));
-        outBuf = (isServerClass)
-             ? outBuf.append(",\n" +
-                getLocalizedMessage("java.launcher.ergo.message2") + "\n\n")
-             : outBuf.append(".\n\n");
+		outBuf = (isServerClass) ? outBuf.append(",\n")
+				.append(getLocalizedMessage("java.launcher.ergo.message2"))
+				.append("\n\n") : outBuf.append(".\n\n");
     }
 
     /**
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/sun/font/AttributeValues.java
--- a/src/share/classes/sun/font/AttributeValues.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/AttributeValues.java	Tue Aug 19 21:59:23 2014 -0300
@@ -542,7 +542,7 @@
                 }
             }
         }
-        b.append("[btx=" + baselineTransform + ", ctx=" + charTransform + "]");
+        b.append("[btx=").append(baselineTransform).append(", ctx=").append(charTransform).append(']');
         b.append('}');
         return b.toString();
     }
diff -r dde9f5cfde5f src/share/classes/sun/font/Decoration.java
--- a/src/share/classes/sun/font/Decoration.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/Decoration.java	Tue Aug 19 21:59:23 2014 -0300
@@ -431,12 +431,12 @@
             StringBuilder sb = new StringBuilder();
             sb.append(super.toString());
             sb.append("[");
-            if (fgPaint != null) sb.append("fgPaint: " + fgPaint);
-            if (bgPaint != null) sb.append(" bgPaint: " + bgPaint);
+            if (fgPaint != null) sb.append("fgPaint: ").append(fgPaint);
+            if (bgPaint != null) sb.append(" bgPaint: ").append(bgPaint);
             if (swapColors) sb.append(" swapColors: true");
             if (strikethrough) sb.append(" strikethrough: true");
-            if (stdUnderline != null) sb.append(" stdUnderline: " + stdUnderline);
-            if (imUnderline != null) sb.append(" imUnderline: " + imUnderline);
+            if (stdUnderline != null) sb.append(" stdUnderline: ").append(stdUnderline);
+            if (imUnderline != null) sb.append(" imUnderline: ").append(imUnderline);
             sb.append("]");
             return sb.toString();
         }
diff -r dde9f5cfde5f src/share/classes/sun/font/StandardGlyphVector.java
--- a/src/share/classes/sun/font/StandardGlyphVector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/sun/font/StandardGlyphVector.java	Tue Aug 19 21:59:23 2014 -0300
@@ -1894,9 +1894,9 @@
             }
         }
         catch(Exception e) {
-            buf.append(" " + e.getMessage());
+            buf.append(' ').append(e.getMessage());
         }
-        buf.append("}");
+        buf.append('}');
 
         return buf;
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/swing/GroupLayout.java
--- a/src/share/classes/javax/swing/GroupLayout.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/GroupLayout.java	Tue Aug 19 21:59:22 2014 -0300
@@ -1213,15 +1213,15 @@
             registerComponents(horizontalGroup, HORIZONTAL);
             registerComponents(verticalGroup, VERTICAL);
         }
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("HORIZONTAL\n");
-        createSpringDescription(buffer, horizontalGroup, "  ", HORIZONTAL);
-        buffer.append("\nVERTICAL\n");
-        createSpringDescription(buffer, verticalGroup, "  ", VERTICAL);
-        return buffer.toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append("HORIZONTAL\n");
+        createSpringDescription(sb, horizontalGroup, "  ", HORIZONTAL);
+        sb.append("\nVERTICAL\n");
+        createSpringDescription(sb, verticalGroup, "  ", VERTICAL);
+        return sb.toString();
     }
 
-    private void createSpringDescription(StringBuffer buffer, Spring spring,
+    private void createSpringDescription(StringBuilder sb, Spring spring,
             String indent, int axis) {
         String origin = "";
         String padding = "";
@@ -1239,20 +1239,19 @@
             padding = ", userCreated=" + paddingSpring.getUserCreated() +
                     ", matches=" + paddingSpring.getMatchDescription();
         }
-        buffer.append(indent + spring.getClass().getName() + " " +
-                Integer.toHexString(spring.hashCode()) + " " +
-                origin +
-                ", size=" + spring.getSize() +
-                ", alignment=" + spring.getAlignment() +
-                " prefs=[" + spring.getMinimumSize(axis) +
-                " " + spring.getPreferredSize(axis) +
-                " " + spring.getMaximumSize(axis) +
-                padding + "]\n");
+		sb.append(indent).append(spring.getClass().getName()).append(' ')
+				.append(Integer.toHexString(spring.hashCode())).append(' ')
+				.append(origin).append(", size=").append(spring.getSize())
+				.append(", alignment=").append(spring.getAlignment())
+				.append(" prefs=[").append(spring.getMinimumSize(axis))
+				.append(' ').append(spring.getPreferredSize(axis)).append(' ')
+				.append(spring.getMaximumSize(axis)).append(padding)
+				.append("]\n");
         if (spring instanceof Group) {
             List<Spring> springs = ((Group)spring).springs;
             indent += "  ";
             for (int counter = 0; counter < springs.size(); counter++) {
-                createSpringDescription(buffer, springs.get(counter), indent,
+                createSpringDescription(sb, springs.get(counter), indent,
                         axis);
             }
         }
diff -r dde9f5cfde5f src/share/classes/javax/swing/JColorChooser.java
--- a/src/share/classes/javax/swing/JColorChooser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/JColorChooser.java	Tue Aug 19 21:59:22 2014 -0300
@@ -543,17 +543,17 @@
      * @return  a string representation of this <code>JColorChooser</code>
      */
     protected String paramString() {
-        StringBuilder chooserPanelsString = new StringBuilder("");
-        for (int i=0; i<chooserPanels.length; i++) {
-            chooserPanelsString.append("[" + chooserPanels[i].toString()
-                                       + "]");
+        StringBuilder chooserPanelsString = new StringBuilder();
+        for (AbstractColorChooserPanel panel : chooserPanels) {
+            chooserPanelsString.append('[').append(panel.toString())
+                    .append(']');
         }
-        String previewPanelString = (previewPanel != null ?
-                                     previewPanel.toString() : "");
+        String previewPanelString = (previewPanel != null ? previewPanel
+                .toString() : "");
 
-        return super.paramString() +
-        ",chooserPanels=" + chooserPanelsString.toString() +
-        ",previewPanel=" + previewPanelString;
+        return super.paramString() + ",chooserPanels="
+                + chooserPanelsString.toString() + ",previewPanel="
+                + previewPanelString;
     }
 
 /////////////////
diff -r dde9f5cfde5f src/share/classes/javax/swing/MultiUIDefaults.java
--- a/src/share/classes/javax/swing/MultiUIDefaults.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/MultiUIDefaults.java	Tue Aug 19 21:59:22 2014 -0300
@@ -190,18 +190,18 @@
 
     @Override
     public synchronized String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("{");
-        Enumeration<?> keys = keys();
-        while (keys.hasMoreElements()) {
-            Object key = keys.nextElement();
-            sb.append(key + "=" + get(key) + ", ");
-        }
-        int length = sb.length();
-        if (length > 1) {
-            sb.delete(length-2, length);
-        }
-        sb.append("}");
-        return sb.toString();
+		StringBuilder sb = new StringBuilder();
+		sb.append("{");
+		Enumeration<?> keys = keys();
+		while (keys.hasMoreElements()) {
+			Object key = keys.nextElement();
+			sb.append(key).append('=').append(get(key)).append(", ");
+		}
+		int length = sb.length();
+		if (length > 1) {
+			sb.delete(length - 2, length);
+		}
+		sb.append('}');
+		return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/javax/swing/RepaintManager.java
--- a/src/share/classes/javax/swing/RepaintManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/RepaintManager.java	Tue Aug 19 21:59:22 2014 -0300
@@ -990,10 +990,7 @@
      * @return a String representation of this object
      */
     public synchronized String toString() {
-        StringBuilder sb = new StringBuilder();
-        if(dirtyComponents != null)
-            sb.append("" + dirtyComponents);
-        return sb.toString();
+		return dirtyComponents != null ? dirtyComponents.toString() : "";
     }
 
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/event/TreeModelEvent.java
--- a/src/share/classes/javax/swing/event/TreeModelEvent.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/event/TreeModelEvent.java	Tue Aug 19 21:59:22 2014 -0300
@@ -294,21 +294,20 @@
     public String toString() {
         StringBuilder   sb = new StringBuilder();
 
-        sb.append(getClass().getName() + " " +
-                  Integer.toString(hashCode()));
+        sb.append(getClass().getName()).append(' ').append(Integer.toString(hashCode()));
         if(path != null)
-            sb.append(" path " + path);
+            sb.append(" path ").append(path);
         if(childIndices != null) {
             sb.append(" indices [ ");
             for(int counter = 0; counter < childIndices.length; counter++)
-                sb.append(Integer.toString(childIndices[counter])+ " ");
-            sb.append("]");
+                sb.append(Integer.toString(childIndices[counter])).append(' ');
+            sb.append(']');
         }
         if(children != null) {
             sb.append(" children [ ");
             for(int counter = 0; counter < children.length; counter++)
-                sb.append(children[counter] + " ");
-            sb.append("]");
+                sb.append(children[counter]).append(' ');
+            sb.append(']');
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Aug 19 21:59:22 2014 -0300
@@ -1330,8 +1330,8 @@
 
             for (Object obj : values) {
                 String val = ((obj == null) ? "" : obj.toString());
-                plainBuf.append(val + "\n");
-                htmlBuf.append("  <li>" + val + "\n");
+                plainBuf.append(val).append('\n');
+                htmlBuf.append("  <li>").append(val).append('\n');
             }
 
             // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicListUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Tue Aug 19 21:59:22 2014 -0300
@@ -2948,8 +2948,8 @@
                 for (int i = 0; i < values.length; i++) {
                     Object obj = values[i];
                     String val = ((obj == null) ? "" : obj.toString());
-                    plainStr.append(val + "\n");
-                    htmlStr.append("  <li>" + val + "\n");
+                    plainStr.append(val).append('\n');
+                    htmlStr.append("  <li>").append(val).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTableUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java	Tue Aug 19 21:59:22 2014 -0300
@@ -2230,11 +2230,11 @@
                     for (int col = 0; col < cols.length; col++) {
                         Object obj = table.getValueAt(rows[row], cols[col]);
                         String val = ((obj == null) ? "" : obj.toString());
-                        plainStr.append(val + "\t");
-                        htmlStr.append("  <td>" + val + "</td>\n");
+                        plainStr.append(val).append('\t');
+                        htmlStr.append("  <td>").append(val).append("</td>\n");
                     }
                     // we want a newline at the end of each line and not a tab
-                    plainStr.deleteCharAt(plainStr.length() - 1).append("\n");
+                    plainStr.deleteCharAt(plainStr.length() - 1).append('\n');
                     htmlStr.append("</tr>\n");
                 }
 
diff -r dde9f5cfde5f src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	Tue Aug 19 21:59:22 2014 -0300
@@ -3618,8 +3618,8 @@
                     boolean leaf = model.isLeaf(node);
                     String label = getDisplayString(path, true, leaf);
 
-                    plainStr.append(label + "\n");
-                    htmlStr.append("  <li>" + label + "\n");
+                    plainStr.append(label).append('\n');
+                    htmlStr.append("  <li>").append(label).append('\n');
                 }
 
                 // remove the last newline
diff -r dde9f5cfde5f src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
--- a/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Tue Aug 19 21:59:22 2014 -0300
@@ -1160,15 +1160,15 @@
             rows = rowMapper.getRowsForPaths(selection);
         else
             rows = null;
-        sb.append(getClass().getName() + " " + hashCode() + " [ ");
+        sb.append(getClass().getName()).append(' ').append(hashCode()).append(" [ ");
         for(int counter = 0; counter < selCount; counter++) {
             if(rows != null)
-                sb.append(selection[counter].toString() + "@" +
-                          Integer.toString(rows[counter])+ " ");
+                sb.append(selection[counter].toString()).append('@')
+                        .append(Integer.toString(rows[counter])).append(' ');
             else
-                sb.append(selection[counter].toString() + " ");
+                sb.append(selection[counter].toString()).append(' ');
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/AudioFileFormat.java
--- a/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/AudioFileFormat.java	Tue Aug 19 21:59:22 2014 -0300
@@ -272,26 +272,25 @@
     @Override
     public String toString() {
 
-        StringBuffer buf = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         //$$fb2002-11-01: fix for 4672864: AudioFileFormat.toString() throws unexpected NullPointerException
         if (type != null) {
-            buf.append(type.toString() + " (." + type.getExtension() + ") file");
+            sb.append(type.toString()).append(" (.").append(type.getExtension()).append(") file");
         } else {
-            buf.append("unknown file format");
+            sb.append("unknown file format");
         }
 
         if (byteLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", byte length: " + byteLength);
+            sb.append(", byte length: ").append(byteLength);
         }
 
-        buf.append(", data format: " + format);
+        sb.append(", data format: ").append(format);
 
         if (frameLength != AudioSystem.NOT_SPECIFIED) {
-            buf.append(", frame length: " + frameLength);
+            sb.append(", frame length: ").append(frameLength);
         }
-
-        return new String(buf);
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/javax/sound/sampled/DataLine.java
--- a/src/share/classes/javax/sound/sampled/DataLine.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/sound/sampled/DataLine.java	Tue Aug 19 21:59:22 2014 -0300
@@ -472,21 +472,27 @@
 
             StringBuilder sb = new StringBuilder();
 
-            if ( (formats.length == 1) && (formats[0] != null) ) {
-                sb.append(" supporting format " + formats[0]);
+            if ((formats.length == 1) && (formats[0] != null)) {
+                sb.append(" supporting format ").append(formats[0]);
             } else if (getFormats().length > 1) {
-                sb.append(" supporting " + getFormats().length + " audio formats");
+                sb.append(" supporting ").append(getFormats().length)
+                        .append(" audio formats");
             }
 
-            if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (maxBufferSize != AudioSystem.NOT_SPECIFIED) ) {
-                sb.append(", and buffers of " + minBufferSize + " to " + maxBufferSize + " bytes");
-            } else if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (minBufferSize > 0) ) {
-                sb.append(", and buffers of at least " + minBufferSize + " bytes");
+            if ((minBufferSize != AudioSystem.NOT_SPECIFIED)
+                    && (maxBufferSize != AudioSystem.NOT_SPECIFIED)) {
+                sb.append(", and buffers of ").append(minBufferSize)
+                        .append(" to ").append(maxBufferSize).append(" bytes");
+            } else if ((minBufferSize != AudioSystem.NOT_SPECIFIED)
+                    && (minBufferSize > 0)) {
+                sb.append(", and buffers of at least ").append(minBufferSize)
+                        .append(" bytes");
             } else if (maxBufferSize != AudioSystem.NOT_SPECIFIED) {
-                sb.append(", and buffers of up to " + minBufferSize + " bytes");
+                sb.append(", and buffers of up to ").append(minBufferSize)
+                        .append(" bytes");
             }
 
-            return new String(super.toString() + sb);
+            return super.toString() + sb.toString();
         }
     }
 }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
--- a/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java	Tue Aug 19 21:59:22 2014 -0300
@@ -651,8 +651,7 @@
         StringBuilder caddrString = new StringBuilder();
         if (clientAddresses != null) {
             for (int i = 0; i < clientAddresses.length; i++) {
-                caddrString.append("clientAddresses[" + i + "] = " +
-                        clientAddresses[i].toString());
+                caddrString.append("clientAddresses[").append(i).append("] = ").append(clientAddresses[i].toString());
             }
         }
         return ("Ticket (hex) = " + "\n" +
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/naming/BinaryRefAddr.java
--- a/src/share/classes/javax/naming/BinaryRefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/BinaryRefAddr.java	Tue Aug 19 21:59:22 2014 -0300
@@ -165,11 +165,11 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Address Type: " + addrType + "\n");
-
+        StringBuilder str = new StringBuilder();
+        str.append("Address Type: ").append(addrType).append('\n');
         str.append("AddressContents: ");
         for (int i = 0; i<buf.length && i < 32; i++) {
-            str.append(Integer.toHexString(buf[i]) +" ");
+            str.append(Integer.toHexString(buf[i])).append(' ');
         }
         if (buf.length >= 32)
             str.append(" ...\n");
diff -r dde9f5cfde5f src/share/classes/javax/naming/NameImpl.java
--- a/src/share/classes/javax/naming/NameImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/NameImpl.java	Tue Aug 19 21:59:22 2014 -0300
@@ -170,7 +170,7 @@
                 endQuote = one ? syntaxEndQuote1 : syntaxEndQuote2;
 
                 i += syntaxTypevalSeparator.length();
-                answer.append(syntaxTypevalSeparator+beginQuote); // add back
+                answer.append(syntaxTypevalSeparator).append(beginQuote); // add back
 
                 // consume string until matching quote
                 for (i += beginQuote.length();
diff -r dde9f5cfde5f src/share/classes/javax/naming/RefAddr.java
--- a/src/share/classes/javax/naming/RefAddr.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/naming/RefAddr.java	Tue Aug 19 21:59:22 2014 -0300
@@ -139,9 +139,9 @@
       * @return The non-null string representation of this address.
       */
     public String toString(){
-        StringBuilder str = new StringBuilder("Type: " + addrType + "\n");
-
-        str.append("Content: " + getContent() + "\n");
+        StringBuilder str = new StringBuilder();
+        str.append("Type: ").append(addrType).append('\n');
+        str.append("Content: ").append(getContent()).append('\n');
         return (str.toString());
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/crypto/CryptoPermission.java
--- a/src/share/classes/javax/crypto/CryptoPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/crypto/CryptoPermission.java	Tue Aug 19 21:59:22 2014 -0300
@@ -369,22 +369,24 @@
      * @return information about this CryptoPermission.
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder(100);
-        buf.append("(CryptoPermission " + alg + " " + maxKeySize);
+        StringBuilder sb = new StringBuilder(100);
+        sb.append("(CryptoPermission ").append(alg).append(' ')
+                .append(maxKeySize);
         if (algParamSpec != null) {
             if (algParamSpec instanceof RC2ParameterSpec) {
-                buf.append(" , effective " +
-                    ((RC2ParameterSpec)algParamSpec).getEffectiveKeyBits());
+                sb.append(" , effective ")
+                        .append(((RC2ParameterSpec) algParamSpec)
+                                .getEffectiveKeyBits());
             } else if (algParamSpec instanceof RC5ParameterSpec) {
-                buf.append(" , rounds " +
-                    ((RC5ParameterSpec)algParamSpec).getRounds());
+                sb.append(" , rounds ").append(
+                        ((RC5ParameterSpec) algParamSpec).getRounds());
             }
         }
         if (exemptionMechanism != null) { // OPTIONAL
-            buf.append(" " + exemptionMechanism);
+            sb.append(' ').append(exemptionMechanism);
         }
-        buf.append(")");
-        return buf.toString();
+        sb.append(')');
+        return sb.toString();
     }
 
     private boolean impliesExemptionMechanism(String exemptionMechanism) {
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/javax/management/MBeanPermission.java
--- a/src/share/classes/javax/management/MBeanPermission.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/MBeanPermission.java	Tue Aug 19 21:59:22 2014 -0300
@@ -455,11 +455,11 @@
         name.append(className);
         if (member == null)
             member = "-";
-        name.append("#" + member);
+        name.append('#').append(member);
         if (objectName == null)
             name.append("[-]");
         else
-            name.append("[").append(objectName.getCanonicalName()).append("]");
+            name.append('[').append(objectName.getCanonicalName()).append(']');
 
         /* In the interests of legibility for Permission.toString(), we
            transform the empty string into "*".  */
diff -r dde9f5cfde5f src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
--- a/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Aug 19 21:59:22 2014 -0300
@@ -716,15 +716,14 @@
         }
 
         retStr.append("\nMBeanInfo for ModelMBean is:");
-        retStr.append("\nCLASSNAME: \t"+ info.getClassName());
-        retStr.append("\nDESCRIPTION: \t"+ info.getDescription());
+        retStr.append("\nCLASSNAME: \t").append(info.getClassName());
+        retStr.append("\nDESCRIPTION: \t").append(info.getDescription());
 
 
         try {
-            retStr.append("\nMBEAN DESCRIPTOR: \t"+
-                          info.getMBeanDescriptor());
+            retStr.append("\nMBEAN DESCRIPTOR: \t").append(info.getMBeanDescriptor());
         } catch (Exception e) {
-            retStr.append("\nMBEAN DESCRIPTOR: \t" + " is invalid");
+            retStr.append("\nMBEAN DESCRIPTOR: \t  is invalid");
         }
 
         retStr.append("\nATTRIBUTES");
@@ -734,13 +733,12 @@
             for (int i=0; i<attrInfo.length; i++) {
                 final ModelMBeanAttributeInfo attInfo =
                     (ModelMBeanAttributeInfo)attrInfo[i];
-                retStr.append(" ** NAME: \t"+ attInfo.getName());
-                retStr.append("    DESCR: \t"+ attInfo.getDescription());
-                retStr.append("    TYPE: \t"+ attInfo.getType() +
-                              "    READ: \t"+ attInfo.isReadable() +
-                              "    WRITE: \t"+ attInfo.isWritable());
-                retStr.append("    DESCRIPTOR: " +
-                              attInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(attInfo.getName());
+                retStr.append("    DESCR: \t").append(attInfo.getDescription());
+                retStr.append("    TYPE: \t").append(attInfo.getType())
+                        .append("    READ: \t").append(attInfo.isReadable())
+                        .append("    WRITE: \t").append(attInfo.isWritable());
+                retStr.append("    DESCRIPTOR: ").append(attInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No attributes **");
@@ -752,14 +750,12 @@
             for (int i=0; i<constrInfo.length; i++) {
                 final ModelMBeanConstructorInfo ctorInfo =
                     (ModelMBeanConstructorInfo)constrInfo[i];
-                retStr.append(" ** NAME: \t"+ ctorInfo.getName());
-                retStr.append("    DESCR: \t"+
-                              ctorInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              ctorInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              ctorInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(ctorInfo.getName());
+                retStr.append("    DESCR: \t").append(ctorInfo.getDescription());
+                retStr.append("    PARAM: \t").append(ctorInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ")
+                        .append(ctorInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No Constructors **");
@@ -771,13 +767,11 @@
             for (int i=0; i<opsInfo.length; i++) {
                 final ModelMBeanOperationInfo operInfo =
                     (ModelMBeanOperationInfo)opsInfo[i];
-                retStr.append(" ** NAME: \t"+ operInfo.getName());
-                retStr.append("    DESCR: \t"+ operInfo.getDescription());
-                retStr.append("    PARAM: \t"+
-                              operInfo.getSignature().length +
-                              " parameter(s)");
-                retStr.append("    DESCRIPTOR: " +
-                              operInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(operInfo.getName());
+                retStr.append("    DESCR: \t").append(operInfo.getDescription());
+                retStr.append("    PARAM: \t").append(operInfo.getSignature().length)
+                        .append(" parameter(s)");
+                retStr.append("    DESCRIPTOR: ").append(operInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No operations ** ");
@@ -790,10 +784,9 @@
             for (int i=0; i<notifInfo.length; i++) {
                 final ModelMBeanNotificationInfo nInfo =
                     (ModelMBeanNotificationInfo)notifInfo[i];
-                retStr.append(" ** NAME: \t"+ nInfo.getName());
-                retStr.append("    DESCR: \t"+ nInfo.getDescription());
-                retStr.append("    DESCRIPTOR: " +
-                              nInfo.getDescriptor().toString());
+                retStr.append(" ** NAME: \t").append(nInfo.getName());
+                retStr.append("    DESCR: \t").append(nInfo.getDescription());
+                retStr.append("    DESCRIPTOR: ").append(nInfo.getDescriptor().toString());
             }
         } else {
             retStr.append(" ** No notifications **");
diff -r dde9f5cfde5f src/share/classes/javax/management/openmbean/CompositeType.java
--- a/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Aug 19 21:59:22 2014 -0300
@@ -463,7 +463,7 @@
                 result.append("(itemName=");
                 result.append(key);
                 result.append(",itemType=");
-                result.append(nameToType.get(key).toString() +")");
+                result.append(nameToType.get(key).toString()).append(')');
                 i++;
             }
             result.append("))");
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/Role.java
--- a/src/share/classes/javax/management/relation/Role.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/Role.java	Tue Aug 19 21:59:22 2014 -0300
@@ -226,17 +226,17 @@
      * @return the description of the role.
      */
     public String toString() {
-        StringBuilder result = new StringBuilder();
-        result.append("role name: " + name + "; role value: ");
-        for (Iterator<ObjectName> objNameIter = objectNameList.iterator();
-             objNameIter.hasNext();) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("role name: ").append(name).append("; role value: ");
+        for (Iterator<ObjectName> objNameIter = objectNameList.iterator(); objNameIter
+                .hasNext();) {
             ObjectName currObjName = objNameIter.next();
-            result.append(currObjName.toString());
+            sb.append(currObjName.toString());
             if (objNameIter.hasNext()) {
-                result.append(", ");
+                sb.append(", ");
             }
         }
-        return result.toString();
+        return sb.toString();
     }
 
     //
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleInfo.java
--- a/src/share/classes/javax/management/relation/RoleInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleInfo.java	Tue Aug 19 21:59:22 2014 -0300
@@ -456,13 +456,13 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role info name: " + name);
-        result.append("; isReadable: " + isReadable);
-        result.append("; isWritable: " + isWritable);
-        result.append("; description: " + description);
-        result.append("; minimum degree: " + minDegree);
-        result.append("; maximum degree: " + maxDegree);
-        result.append("; MBean class: " + referencedMBeanClassName);
+        result.append("role info name: ").append(name);
+        result.append("; isReadable: ").append(isReadable);
+        result.append("; isWritable: ").append(isWritable);
+        result.append("; description: ").append(description);
+        result.append("; minimum degree: ").append(minDegree);
+        result.append("; maximum degree: ").append(maxDegree);
+        result.append("; MBean class: ").append(referencedMBeanClassName);
         return result.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/javax/management/relation/RoleUnresolved.java
--- a/src/share/classes/javax/management/relation/RoleUnresolved.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/javax/management/relation/RoleUnresolved.java	Tue Aug 19 21:59:22 2014 -0300
@@ -282,7 +282,7 @@
      */
     public String toString() {
         StringBuilder result = new StringBuilder();
-        result.append("role name: " + roleName);
+        result.append("role name: ").append(roleName);
         if (roleValue != null) {
             result.append("; value: ");
             for (Iterator<ObjectName> objNameIter = roleValue.iterator();
@@ -294,7 +294,7 @@
                 }
             }
         }
-        result.append("; problem type: " + problemType);
+        result.append("; problem type: ").append(problemType);
         return result.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/util/Scanner.java
--- a/src/share/classes/java/util/Scanner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/Scanner.java	Tue Aug 19 21:59:22 2014 -0300
@@ -1304,20 +1304,20 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.Scanner");
-        sb.append("[delimiters=" + delimPattern + "]");
-        sb.append("[position=" + position + "]");
-        sb.append("[match valid=" + matchValid + "]");
-        sb.append("[need input=" + needInput + "]");
-        sb.append("[source closed=" + sourceClosed + "]");
-        sb.append("[skipped=" + skipped + "]");
-        sb.append("[group separator=" + groupSeparator + "]");
-        sb.append("[decimal separator=" + decimalSeparator + "]");
-        sb.append("[positive prefix=" + positivePrefix + "]");
-        sb.append("[negative prefix=" + negativePrefix + "]");
-        sb.append("[positive suffix=" + positiveSuffix + "]");
-        sb.append("[negative suffix=" + negativeSuffix + "]");
-        sb.append("[NaN string=" + nanString + "]");
-        sb.append("[infinity string=" + infinityString + "]");
+        sb.append("[delimiters=").append(delimPattern).append(']');
+        sb.append("[position=").append(position).append(']');
+        sb.append("[match valid=").append(matchValid).append(']');
+        sb.append("[need input=").append(needInput).append(']');
+        sb.append("[source closed=").append(sourceClosed).append(']');
+        sb.append("[skipped=").append(skipped).append(']');
+        sb.append("[group separator=").append(groupSeparator).append(']');
+        sb.append("[decimal separator=").append(decimalSeparator).append(']');
+        sb.append("[positive prefix=").append(positivePrefix).append(']');
+        sb.append("[negative prefix=").append(negativePrefix).append(']');
+        sb.append("[positive suffix=").append(positiveSuffix).append(']');
+        sb.append("[negative suffix=").append(negativeSuffix).append(']');
+        sb.append("[NaN string=").append(nanString).append(']');
+        sb.append("[infinity string=").append(infinityString).append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Matcher.java
--- a/src/share/classes/java/util/regex/Matcher.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Matcher.java	Tue Aug 19 21:59:22 2014 -0300
@@ -1295,14 +1295,14 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("java.util.regex.Matcher");
-        sb.append("[pattern=" + pattern());
+        sb.append("[pattern=").append(pattern());
         sb.append(" region=");
-        sb.append(regionStart() + "," + regionEnd());
+        sb.append(regionStart()).append(',').append(regionEnd());
         sb.append(" lastmatch=");
         if ((first >= 0) && (group() != null)) {
             sb.append(group());
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/util/regex/Pattern.java
--- a/src/share/classes/java/util/regex/Pattern.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/util/regex/Pattern.java	Tue Aug 19 21:59:22 2014 -0300
@@ -1488,10 +1488,10 @@
         for(int x=0; x<perms.length; x++) {
             String next = base + perms[x];
             if (x>0)
-                result.append("|"+next);
+                result.append('|').append(next);
             next = composeOneStep(next);
             if (next != null)
-                result.append("|"+produceEquivalentAlternation(next));
+                result.append('|').append(produceEquivalentAlternation(next));
         }
         return result.toString();
     }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/text/ChoiceFormat.java
--- a/src/share/classes/java/text/ChoiceFormat.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/text/ChoiceFormat.java	Tue Aug 19 21:59:22 2014 -0300
@@ -272,7 +272,7 @@
             double tryLess = Math.abs(Math.IEEEremainder(less, 1.0d));
 
             if (tryLessOrEqual < tryLess) {
-                result.append(""+choiceLimits[i]);
+                result.append(choiceLimits[i]);
                 result.append('#');
             } else {
                 if (choiceLimits[i] == Double.POSITIVE_INFINITY) {
@@ -280,7 +280,7 @@
                 } else if (choiceLimits[i] == Double.NEGATIVE_INFINITY) {
                     result.append("-\u221E");
                 } else {
-                    result.append(""+less);
+                    result.append(less);
                 }
                 result.append('<');
             }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSigner.java
--- a/src/share/classes/java/security/CodeSigner.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSigner.java	Tue Aug 19 21:59:21 2014 -0300
@@ -156,9 +156,9 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("Signer: " + signerCertPath.getCertificates().get(0));
+        sb.append("Signer: ").append(signerCertPath.getCertificates().get(0));
         if (timestamp != null) {
-            sb.append("timestamp: " + timestamp);
+            sb.append("timestamp: ").append(timestamp);
         }
         sb.append(")");
         return sb.toString();
diff -r dde9f5cfde5f src/share/classes/java/security/CodeSource.java
--- a/src/share/classes/java/security/CodeSource.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/CodeSource.java	Tue Aug 19 21:59:21 2014 -0300
@@ -468,12 +468,12 @@
 
         if (this.certs != null && this.certs.length > 0) {
             for (int i = 0; i < this.certs.length; i++) {
-                sb.append( " " + this.certs[i]);
+                sb.append(' ').append(this.certs[i]);
             }
 
         } else if (this.signers != null && this.signers.length > 0) {
             for (int i = 0; i < this.signers.length; i++) {
-                sb.append( " " + this.signers[i]);
+                sb.append(' ').append(this.signers[i]);
             }
         } else {
             sb.append(" <no signer certificates>");
diff -r dde9f5cfde5f src/share/classes/java/security/KeyStore.java
--- a/src/share/classes/java/security/KeyStore.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/KeyStore.java	Tue Aug 19 21:59:21 2014 -0300
@@ -610,8 +610,8 @@
          */
         public String toString() {
             StringBuilder sb = new StringBuilder();
-            sb.append("Private key entry and certificate chain with "
-                + chain.length + " elements:\r\n");
+            sb.append("Private key entry and certificate chain with ")
+                    .append(chain.length).append(" elements:\r\n");
             for (Certificate cert : chain) {
                 sb.append(cert);
                 sb.append("\r\n");
diff -r dde9f5cfde5f src/share/classes/java/security/PermissionCollection.java
--- a/src/share/classes/java/security/PermissionCollection.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/PermissionCollection.java	Tue Aug 19 21:59:21 2014 -0300
@@ -179,13 +179,13 @@
     public String toString() {
         Enumeration<Permission> enum_ = elements();
         StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()+" (\n");
+        sb.append(super.toString()).append(" (\n");
         while (enum_.hasMoreElements()) {
             try {
-                sb.append(" ");
+                sb.append(' ');
                 sb.append(enum_.nextElement().toString());
-                sb.append("\n");
-            } catch (NoSuchElementException e){
+                sb.append('\n');
+            } catch (NoSuchElementException e) {
                 // ignore
             }
         }
diff -r dde9f5cfde5f src/share/classes/java/security/ProtectionDomain.java
--- a/src/share/classes/java/security/ProtectionDomain.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/ProtectionDomain.java	Tue Aug 19 21:59:21 2014 -0300
@@ -285,34 +285,32 @@
     /**
      * Convert a ProtectionDomain to a String.
      */
-    @Override public String toString() {
+	@Override
+    public String toString() {
         String pals = "<no principals>";
         if (principals != null && principals.length > 0) {
-            StringBuilder palBuf = new StringBuilder("(principals ");
+            StringBuilder palBuilder = new StringBuilder("(principals ");
 
             for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                            " \"" + principals[i].getName() +
-                            "\"");
-                if (i < principals.length-1)
-                    palBuf.append(",\n");
-                else
-                    palBuf.append(")\n");
+                palBuilder.append(principals[i].getClass().getName())
+                        .append(" \"").append(principals[i].getName())
+                        .append('"');
+                if (i < principals.length - 1) {
+                    palBuilder.append(",\n");
+                } else {
+                    palBuilder.append(")\n");
+                }
             }
-            pals = palBuf.toString();
+            pals = palBuilder.toString();
         }
 
         // Check if policy is set; we don't want to load
         // the policy prematurely here
-        PermissionCollection pc = Policy.isSet() && seeAllp() ?
-                                      mergePermissions():
-                                      getPermissions();
+        PermissionCollection pc = Policy.isSet() && seeAllp() ? mergePermissions()
+                : getPermissions();
 
-        return "ProtectionDomain "+
-            " "+codesource+"\n"+
-            " "+classloader+"\n"+
-            " "+pals+"\n"+
-            " "+pc+"\n";
+        return "ProtectionDomain " + " " + codesource + "\n" + " "
+                + classloader + "\n" + " " + pals + "\n" + " " + pc + "\n";
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/java/security/Timestamp.java
--- a/src/share/classes/java/security/Timestamp.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/Timestamp.java	Tue Aug 19 21:59:21 2014 -0300
@@ -143,10 +143,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        sb.append("timestamp: " + timestamp);
+        sb.append("timestamp: ").append(timestamp);
         List<? extends Certificate> certs = signerCertPath.getCertificates();
         if (!certs.isEmpty()) {
-            sb.append("TSA: " + certs.get(0));
+            sb.append("TSA: ").append(certs.get(0));
         } else {
             sb.append("TSA: <empty>");
         }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CertPath.java
--- a/src/share/classes/java/security/cert/CertPath.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CertPath.java	Tue Aug 19 21:59:21 2014 -0300
@@ -221,20 +221,16 @@
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        Iterator<? extends Certificate> stringIterator =
-                                        getCertificates().iterator();
 
-        sb.append("\n" + type + " Cert Path: length = "
-            + getCertificates().size() + ".\n");
-        sb.append("[\n");
+        sb.append('\n').append(type).append(" Cert Path: length = ")
+                .append(getCertificates().size()).append(".\n").append("[\n");
         int i = 1;
-        while (stringIterator.hasNext()) {
+        for (Certificate stringCert : getCertificates()) {
             sb.append("=========================================="
-                + "===============Certificate " + i + " start.\n");
-            Certificate stringCert = stringIterator.next();
+                 + "===============Certificate ").append(i).append(" start.\n");
             sb.append(stringCert.toString());
             sb.append("\n========================================"
-                + "=================Certificate " + i + " end.\n\n\n");
+                + "=================Certificate ").append(i).append(" end.\n\n\n");
             i++;
         }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/CollectionCertStoreParameters.java
--- a/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/CollectionCertStoreParameters.java	Tue Aug 19 21:59:21 2014 -0300
@@ -134,8 +134,8 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("CollectionCertStoreParameters: [\n");
-        sb.append("  collection: " + coll + "\n");
-        sb.append("]");
+        sb.append("  collection: ").append(coll).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/LDAPCertStoreParameters.java
--- a/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/LDAPCertStoreParameters.java	Tue Aug 19 21:59:21 2014 -0300
@@ -141,9 +141,9 @@
         StringBuilder sb = new StringBuilder();
         sb.append("LDAPCertStoreParameters: [\n");
 
-        sb.append("  serverName: " + serverName + "\n");
-        sb.append("  port: " + port + "\n");
-        sb.append("]");
+        sb.append("  serverName: ").append(serverName).append('\n');
+        sb.append("  port: ").append(port).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXBuilderParameters.java
--- a/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXBuilderParameters.java	Tue Aug 19 21:59:21 2014 -0300
@@ -192,7 +192,7 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         sb.append(super.toString());
-        sb.append("  Maximum Path Length: " + maxPathLength + "\n");
+        sb.append("  Maximum Path Length: ").append(maxPathLength).append('\n');
         sb.append("]\n");
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java	Tue Aug 19 21:59:21 2014 -0300
@@ -109,11 +109,13 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathBuilderResult: [\n");
-        sb.append("  Certification Path: " + certPath + "\n");
-        sb.append("  Trust Anchor: " + getTrustAnchor().toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(getPolicyTree()) + "\n");
-        sb.append("  Subject Public Key: " + getPublicKey() + "\n");
-        sb.append("]");
+        sb.append("  Certification Path: ").append(certPath).append('\n');
+        sb.append("  Trust Anchor: ").append(getTrustAnchor().toString())
+                .append('\n');
+        sb.append("  Policy Tree: ").append(String.valueOf(getPolicyTree()))
+                .append('\n');
+        sb.append("  Subject Public Key: ").append(getPublicKey()).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
--- a/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java	Tue Aug 19 21:59:21 2014 -0300
@@ -150,10 +150,10 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("PKIXCertPathValidatorResult: [\n");
-        sb.append("  Trust Anchor: " + trustAnchor.toString() + "\n");
-        sb.append("  Policy Tree: " + String.valueOf(policyTree) + "\n");
-        sb.append("  Subject Public Key: " + subjectPublicKey + "\n");
-        sb.append("]");
+        sb.append("  Trust Anchor: ").append(trustAnchor.toString()).append('\n');
+        sb.append("  Policy Tree: ").append(String.valueOf(policyTree)).append('\n');
+        sb.append("  Subject Public Key: ").append(subjectPublicKey).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PKIXParameters.java
--- a/src/share/classes/java/security/cert/PKIXParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PKIXParameters.java	Tue Aug 19 21:59:21 2014 -0300
@@ -698,8 +698,8 @@
 
         /* start with trusted anchor info */
         if (unmodTrustAnchors != null) {
-            sb.append("  Trust Anchors: " + unmodTrustAnchors.toString()
-                + "\n");
+            sb.append("  Trust Anchors: ").append(unmodTrustAnchors.toString())
+                    .append('\n');
         }
 
         /* now, append initial state information */
@@ -707,30 +707,41 @@
             if (unmodInitialPolicies.isEmpty()) {
                 sb.append("  Initial Policy OIDs: any\n");
             } else {
-                sb.append("  Initial Policy OIDs: ["
-                    + unmodInitialPolicies.toString() + "]\n");
+                sb.append("  Initial Policy OIDs: [")
+                        .append(unmodInitialPolicies.toString()).append("]\n");
             }
         }
 
         /* now, append constraints on all certificates in the path */
-        sb.append("  Validity Date: " + String.valueOf(date) + "\n");
-        sb.append("  Signature Provider: " + String.valueOf(sigProvider) + "\n");
-        sb.append("  Default Revocation Enabled: " + revocationEnabled + "\n");
-        sb.append("  Explicit Policy Required: " + explicitPolicyRequired + "\n");
-        sb.append("  Policy Mapping Inhibited: " + policyMappingInhibited + "\n");
-        sb.append("  Any Policy Inhibited: " + anyPolicyInhibited + "\n");
-        sb.append("  Policy Qualifiers Rejected: " + policyQualifiersRejected + "\n");
+        sb.append("  Validity Date: ").append(String.valueOf(date))
+                .append('\n');
+        sb.append("  Signature Provider: ").append(String.valueOf(sigProvider))
+                .append('\n');
+        sb.append("  Default Revocation Enabled: ").append(revocationEnabled)
+                .append('\n');
+        sb.append("  Explicit Policy Required: ")
+                .append(explicitPolicyRequired).append('\n');
+        sb.append("  Policy Mapping Inhibited: ")
+                .append(policyMappingInhibited).append('\n');
+        sb.append("  Any Policy Inhibited: ").append(anyPolicyInhibited)
+                .append('\n');
+        sb.append("  Policy Qualifiers Rejected: ")
+                .append(policyQualifiersRejected).append('\n');
 
         /* now, append target cert requirements */
-        sb.append("  Target Cert Constraints: " + String.valueOf(certSelector) + "\n");
+        sb.append("  Target Cert Constraints: ")
+                .append(String.valueOf(certSelector)).append('\n');
 
         /* finally, append miscellaneous parameters */
-        if (certPathCheckers != null)
-            sb.append("  Certification Path Checkers: ["
-                + certPathCheckers.toString() + "]\n");
-        if (certStores != null)
-            sb.append("  CertStores: [" + certStores.toString() + "]\n");
-        sb.append("]");
+        if (certPathCheckers != null) {
+            sb.append("  Certification Path Checkers: [")
+                    .append(certPathCheckers.toString()).append("]\n");
+        }
+        if (certStores != null) {
+            sb.append("  CertStores: [").append(certStores.toString())
+                    .append("]\n");
+        }
+        sb.append(']');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/PolicyQualifierInfo.java
--- a/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/PolicyQualifierInfo.java	Tue Aug 19 21:59:21 2014 -0300
@@ -158,15 +158,17 @@
      *         {@code PolicyQualifierInfo}
      */
     public String toString() {
-        if (pqiString != null)
+        if (pqiString != null) {
             return pqiString;
+        }
         HexDumpEncoder enc = new HexDumpEncoder();
         StringBuilder sb = new StringBuilder();
         sb.append("PolicyQualifierInfo: [\n");
-        sb.append("  qualifierID: " + mId + "\n");
-        sb.append("  qualifier: " +
-            (mData == null ? "null" : enc.encodeBuffer(mData)) + "\n");
-        sb.append("]");
+        sb.append("  qualifierID: ").append(mId).append('\n');
+        sb.append("  qualifier: ")
+                .append(mData == null ? "null" : enc.encodeBuffer(mData))
+                .append('\n');
+        sb.append(']');
         pqiString = sb.toString();
         return pqiString;
     }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/TrustAnchor.java
--- a/src/share/classes/java/security/cert/TrustAnchor.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/TrustAnchor.java	Tue Aug 19 21:59:21 2014 -0300
@@ -320,14 +320,18 @@
         StringBuilder sb = new StringBuilder();
         sb.append("[\n");
         if (pubKey != null) {
-            sb.append("  Trusted CA Public Key: " + pubKey.toString() + "\n");
-            sb.append("  Trusted CA Issuer Name: "
-                + String.valueOf(caName) + "\n");
+            sb.append("  Trusted CA Public Key: ").append(pubKey.toString())
+                    .append('\n');
+            sb.append("  Trusted CA Issuer Name: ")
+                    .append(String.valueOf(caName)).append('\n');
         } else {
-            sb.append("  Trusted CA cert: " + trustedCert.toString() + "\n");
+            sb.append("  Trusted CA cert: ").append(trustedCert.toString())
+                    .append('\n');
         }
-        if (nc != null)
-            sb.append("  Name Constraints: " + nc.toString() + "\n");
+        if (nc != null) {
+            sb.append("  Name Constraints: ").append(nc.toString())
+                    .append('\n');
+        }
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CRLSelector.java
--- a/src/share/classes/java/security/cert/X509CRLSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CRLSelector.java	Tue Aug 19 21:59:21 2014 -0300
@@ -572,17 +572,17 @@
             sb.append("  IssuerNames:\n");
             Iterator<Object> i = issuerNames.iterator();
             while (i.hasNext())
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
         }
         if (minCRL != null)
-            sb.append("  minCRLNumber: " + minCRL + "\n");
+            sb.append("  minCRLNumber: ").append(minCRL).append('\n');
         if (maxCRL != null)
-            sb.append("  maxCRLNumber: " + maxCRL + "\n");
+            sb.append("  maxCRLNumber: ").append(maxCRL).append('\n');
         if (dateAndTime != null)
-            sb.append("  dateAndTime: " + dateAndTime + "\n");
+            sb.append("  dateAndTime: ").append(dateAndTime).append('\n');
         if (certChecking != null)
-            sb.append("  Certificate being checked: " + certChecking + "\n");
-        sb.append("]");
+            sb.append("  Certificate being checked: ").append(certChecking).append('\n');
+        sb.append(']');
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/java/security/cert/X509CertSelector.java
--- a/src/share/classes/java/security/cert/X509CertSelector.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/security/cert/X509CertSelector.java	Tue Aug 19 21:59:21 2014 -0300
@@ -1814,72 +1814,75 @@
         StringBuilder sb = new StringBuilder();
         sb.append("X509CertSelector: [\n");
         if (x509Cert != null) {
-            sb.append("  Certificate: " + x509Cert.toString() + "\n");
+            sb.append("  Certificate: ").append(x509Cert.toString())
+                    .append('\n');
         }
         if (serialNumber != null) {
-            sb.append("  Serial Number: " + serialNumber.toString() + "\n");
+            sb.append("  Serial Number: ").append(serialNumber.toString())
+                    .append('\n');
         }
         if (issuer != null) {
-            sb.append("  Issuer: " + getIssuerAsString() + "\n");
+            sb.append("  Issuer: ").append(getIssuerAsString()).append('\n');
         }
         if (subject != null) {
-            sb.append("  Subject: " + getSubjectAsString() + "\n");
+            sb.append("  Subject: ").append(getSubjectAsString()).append('\n');
         }
-        sb.append("  matchAllSubjectAltNames flag: "
-                  + String.valueOf(matchAllSubjectAltNames) + "\n");
+        sb.append("  matchAllSubjectAltNames flag: ")
+                .append(String.valueOf(matchAllSubjectAltNames)).append('\n');
         if (subjectAlternativeNames != null) {
             sb.append("  SubjectAlternativeNames:\n");
             Iterator<List<?>> i = subjectAlternativeNames.iterator();
             while (i.hasNext()) {
                 List<?> list = i.next();
-                sb.append("    type " + list.get(0) +
-                          ", name " + list.get(1) + "\n");
+                sb.append("    type ").append(list.get(0)).append(", name ")
+                        .append(list.get(1)).append('\n');
             }
         }
         if (subjectKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Subject Key Identifier: " +
-                      enc.encodeBuffer(subjectKeyID) + "\n");
+            sb.append("  Subject Key Identifier: ")
+                    .append(enc.encodeBuffer(subjectKeyID)).append('\n');
         }
         if (authorityKeyID != null) {
             HexDumpEncoder enc = new HexDumpEncoder();
-            sb.append("  Authority Key Identifier: " +
-                      enc.encodeBuffer(authorityKeyID) + "\n");
+            sb.append("  Authority Key Identifier: ")
+                    .append(enc.encodeBuffer(authorityKeyID)).append('\n');
         }
         if (certificateValid != null) {
-            sb.append("  Certificate Valid: " +
-                      certificateValid.toString() + "\n");
+            sb.append("  Certificate Valid: ")
+                    .append(certificateValid.toString()).append('\n');
         }
         if (privateKeyValid != null) {
-            sb.append("  Private Key Valid: " +
-                      privateKeyValid.toString() + "\n");
+            sb.append("  Private Key Valid: ")
+                    .append(privateKeyValid.toString()).append('\n');
         }
         if (subjectPublicKeyAlgID != null) {
-            sb.append("  Subject Public Key AlgID: " +
-                      subjectPublicKeyAlgID.toString() + "\n");
+            sb.append("  Subject Public Key AlgID: ")
+                    .append(subjectPublicKeyAlgID.toString()).append('\n');
         }
         if (subjectPublicKey != null) {
-            sb.append("  Subject Public Key: " +
-                      subjectPublicKey.toString() + "\n");
+            sb.append("  Subject Public Key: ")
+                    .append(subjectPublicKey.toString()).append('\n');
         }
         if (keyUsage != null) {
-            sb.append("  Key Usage: " + keyUsageToString(keyUsage) + "\n");
+            sb.append("  Key Usage: ").append(keyUsageToString(keyUsage))
+                    .append('\n');
         }
         if (keyPurposeSet != null) {
-            sb.append("  Extended Key Usage: " +
-                      keyPurposeSet.toString() + "\n");
+            sb.append("  Extended Key Usage: ")
+                    .append(keyPurposeSet.toString()).append('\n');
         }
         if (policy != null) {
-            sb.append("  Policy: " + policy.toString() + "\n");
+            sb.append("  Policy: ").append(policy.toString()).append('\n');
         }
         if (pathToGeneralNames != null) {
             sb.append("  Path to names:\n");
             Iterator<GeneralNameInterface> i = pathToGeneralNames.iterator();
             while (i.hasNext()) {
-                sb.append("    " + i.next() + "\n");
+                sb.append("    ").append(i.next()).append('\n');
             }
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/rmi/dgc/VMID.java
--- a/src/share/classes/java/rmi/dgc/VMID.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/rmi/dgc/VMID.java	Tue Aug 19 21:59:21 2014 -0300
@@ -124,8 +124,7 @@
         if (addr != null)
             for (int i = 0; i < addr.length; ++ i) {
                 int x = addr[i] & 0xFF;
-                sb.append((x < 0x10 ? "0" : "") +
-                          Integer.toString(x, 16));
+                sb.append(x < 0x10 ? "0" : "").append(Integer.toString(x, 16));
             }
         sb.append(':');
         sb.append(uid.toString());
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/java/lang/management/MemoryUsage.java
--- a/src/share/classes/java/lang/management/MemoryUsage.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/MemoryUsage.java	Tue Aug 19 21:59:21 2014 -0300
@@ -237,13 +237,16 @@
      * Returns a descriptive representation of this memory usage.
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder();
-        buf.append("init = " + init + "(" + (init >> 10) + "K) ");
-        buf.append("used = " + used + "(" + (used >> 10) + "K) ");
-        buf.append("committed = " + committed + "(" +
-                   (committed >> 10) + "K) " );
-        buf.append("max = " + max + "(" + (max >> 10) + "K)");
-        return buf.toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append("init = ").append(init).append('(').append(init >> 10)
+                .append("K) ");
+        sb.append("used = ").append(used).append('(').append(used >> 10)
+                .append("K) ");
+        sb.append("committed = ").append(committed).append('(')
+                .append(committed >> 10).append("K) ");
+        sb.append("max = ").append(max).append('(').append(max >> 10)
+                .append("K)");
+        return sb.toString();
     }
 
     /**
diff -r dde9f5cfde5f src/share/classes/java/lang/management/ThreadInfo.java
--- a/src/share/classes/java/lang/management/ThreadInfo.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/java/lang/management/ThreadInfo.java	Tue Aug 19 21:59:21 2014 -0300
@@ -579,15 +579,17 @@
      * @return a string representation of this thread info.
      */
     public String toString() {
-        StringBuilder sb = new StringBuilder("\"" + getThreadName() + "\"" +
-                                             " Id=" + getThreadId() + " " +
-                                             getThreadState());
+    	StringBuilder sb = new StringBuilder();
+    	sb.append('"').append(getThreadName()).append('"')
+    	.append(" Id=").append(getThreadId()).append(' ')
+    	.append(getThreadState());
+
         if (getLockName() != null) {
-            sb.append(" on " + getLockName());
+            sb.append(" on ").append(getLockName());
         }
         if (getLockOwnerName() != null) {
-            sb.append(" owned by \"" + getLockOwnerName() +
-                      "\" Id=" + getLockOwnerId());
+            sb.append(" owned by \"").append(getLockOwnerName())
+                    .append("\" Id=").append(getLockOwnerId());
         }
         if (isSuspended()) {
             sb.append(" (suspended)");
@@ -599,21 +601,21 @@
         int i = 0;
         for (; i < stackTrace.length && i < MAX_FRAMES; i++) {
             StackTraceElement ste = stackTrace[i];
-            sb.append("\tat " + ste.toString());
+            sb.append("\tat ").append(ste.toString());
             sb.append('\n');
             if (i == 0 && getLockInfo() != null) {
                 Thread.State ts = getThreadState();
                 switch (ts) {
                     case BLOCKED:
-                        sb.append("\t-  blocked on " + getLockInfo());
+                        sb.append("\t-  blocked on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     case TIMED_WAITING:
-                        sb.append("\t-  waiting on " + getLockInfo());
+                        sb.append("\t-  waiting on ").append(getLockInfo());
                         sb.append('\n');
                         break;
                     default:
@@ -622,7 +624,7 @@
 
             for (MonitorInfo mi : lockedMonitors) {
                 if (mi.getLockedStackDepth() == i) {
-                    sb.append("\t-  locked " + mi);
+                    sb.append("\t-  locked ").append(mi);
                     sb.append('\n');
                 }
             }
@@ -634,10 +636,10 @@
 
        LockInfo[] locks = getLockedSynchronizers();
        if (locks.length > 0) {
-           sb.append("\n\tNumber of locked synchronizers = " + locks.length);
+           sb.append("\n\tNumber of locked synchronizers = ").append(locks.length);
            sb.append('\n');
            for (LockInfo li : locks) {
-               sb.append("\t- " + li);
+               sb.append("\t- ").append(li);
                sb.append('\n');
            }
        }
-------------- next part --------------
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHParameters.java
--- a/src/share/classes/com/sun/crypto/provider/DHParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHParameters.java	Tue Aug 19 21:59:21 2014 -0300
@@ -137,8 +137,11 @@
                                + Debug.toHexString(this.p)
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
-        if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+        if (this.l != 0) {
+            sb.append(LINE_SEP).append("l:")
+            .append(LINE_SEP).append("    ")
+            .append(this.l);
+        }
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/DHPublicKey.java
--- a/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/DHPublicKey.java	Tue Aug 19 21:59:21 2014 -0300
@@ -268,8 +268,10 @@
                                + Debug.toHexString(this.p)
                                + LINE_SEP + "g:" + LINE_SEP
                                + Debug.toHexString(this.g));
-        if (this.l != 0)
-            sb.append(LINE_SEP + "l:" + LINE_SEP + "    " + this.l);
+        if (this.l != 0) {
+            sb.append(LINE_SEP).append("l:").append(LINE_SEP)
+            .append("    ").append(this.l);
+        }
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/GCMParameters.java
--- a/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/GCMParameters.java	Tue Aug 19 21:59:21 2014 -0300
@@ -140,7 +140,8 @@
             = new StringBuilder(LINE_SEP + "    iv:" + LINE_SEP + "["
                 + encoder.encodeBuffer(iv) + "]");
 
-        sb.append(LINE_SEP + "tLen(bits):" + LINE_SEP + tLen*8 + LINE_SEP);
+        sb.append(LINE_SEP).append("tLen(bits):").append(LINE_SEP)
+        .append(tLen * 8).append(LINE_SEP);
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/OAEPParameters.java
--- a/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/OAEPParameters.java	Tue Aug 19 21:59:21 2014 -0300
@@ -239,10 +239,12 @@
 
     protected String engineToString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("MD: " + mdName + "\n");
-        sb.append("MGF: MGF1" + mgfSpec.getDigestAlgorithm() + "\n");
-        sb.append("PSource: PSpecified " +
-            (p.length==0? "":Debug.toHexString(new BigInteger(p))) + "\n");
+        sb.append("MD: ").append(mdName).append('\n');
+        sb.append("MGF: MGF1").append(mgfSpec.getDigestAlgorithm())
+                .append('\n');
+        sb.append("PSource: PSpecified ")
+                .append(p.length == 0 ? "" : Debug
+                        .toHexString(new BigInteger(p))).append('\n');
         return sb.toString();
     }
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/crypto/provider/RC2Parameters.java
--- a/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/crypto/provider/RC2Parameters.java	Tue Aug 19 21:59:21 2014 -0300
@@ -221,8 +221,9 @@
                 + encoder.encodeBuffer(iv) + "]");
 
         if (version != 0) {
-            sb.append(LINE_SEP + "version:" + LINE_SEP
-                + version + LINE_SEP);
+            sb.append(LINE_SEP).append("version:")
+                    .append(LINE_SEP).append(version)
+                    .append(LINE_SEP);
         }
         return sb.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java	Tue Aug 19 21:59:21 2014 -0300
@@ -65,7 +65,7 @@
                 "extractSubNet", "BINARY ARRAY :");
             StringBuilder sb = new StringBuilder();
             for(int i =0; i < addrLength; i++) {
-                sb.append((b[i] & 0xFF) + ":");
+                sb.append(b[i] & 0xFF).append(':');
             }
             SNMP_LOGGER.logp(Level.FINEST, NetMaskImpl.class.getName(),
                 "extractSubNet", sb.toString());
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java	Tue Aug 19 21:59:21 2014 -0300
@@ -204,7 +204,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java	Tue Aug 19 21:59:21 2014 -0300
@@ -379,7 +379,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(IDENTIFIER);
-   jjtn000.name.append( "." + t.image);
+   jjtn000.name.append('.').append(t.image);
       }
     } finally {
     if (jjtc000) {
@@ -408,7 +408,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -454,7 +454,7 @@
         }
         jj_consume_token(MARK);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
     } finally {
   if (jjtc000) {
@@ -483,7 +483,7 @@
         }
         jj_consume_token(DOT);
         t = jj_consume_token(INTEGER_LITERAL);
-   jjtn000.address.append( "." + t.image);
+   jjtn000.address.append('.').append(t.image);
       }
       jj_consume_token(MASK);
       t = jj_consume_token(INTEGER_LITERAL);
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj	Tue Aug 19 21:59:21 2014 -0300
@@ -420,7 +420,7 @@
   t=<IDENTIFIER> { jjtn000.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtn000.name.append( "." + t.image); }
+  {jjtn000.name.append( '.').append(t.image); }
 )*/*@bgen(jjtree)*/
   } finally {
     if (jjtc000) {
@@ -447,7 +447,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -501,7 +501,7 @@
   {jjtn000.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )*/*@bgen(jjtree)*/
 } finally {
   if (jjtc000) {
@@ -527,7 +527,7 @@
   {jjtn000.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtn000.address.append( "." + t.image); }
+  {jjtn000.address.append( '.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL>/*@bgen(jjtree)*/
                             {
                               jjtree.closeNodeScope(jjtn000, true);
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt	Tue Aug 19 21:59:21 2014 -0300
@@ -213,7 +213,7 @@
   t=<IDENTIFIER> { jjtThis.name.append(t.image); }
 (
 "." t=<IDENTIFIER> 
-  {jjtThis.name.append( "." + t.image); }
+  {jjtThis.name.append( '.').append(t.image); }
 )*
 
 }
@@ -228,7 +228,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )*
 
 }
@@ -253,7 +253,7 @@
   {jjtThis.address.append(t.image); }
 (
 "!" t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )*
 }
 
@@ -267,7 +267,7 @@
   {jjtThis.address.append(t.image); }
 (
 "." t= <INTEGER_LITERAL> 
-  {jjtThis.address.append( "." + t.image); }
+  {jjtThis.address.append( '.').append(t.image); }
 )* "/" t= <INTEGER_LITERAL> {jjtThis.mask = t.image; }
 }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java	Tue Aug 19 21:59:21 2014 -0300
@@ -99,7 +99,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java
--- a/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java	Tue Aug 19 21:59:21 2014 -0300
@@ -479,10 +479,10 @@
      */
     public String printMessage() {
         StringBuilder sb = new StringBuilder();
-        sb.append("msgId : " + msgId + "\n");
-        sb.append("msgMaxSize : " + msgMaxSize + "\n");
-        sb.append("msgFlags : " + msgFlags + "\n");
-        sb.append("msgSecurityModel : " + msgSecurityModel + "\n");
+        sb.append("msgId : ").append(msgId).append('\n');
+        sb.append("msgMaxSize : ").append(msgMaxSize).append('\n');
+        sb.append("msgFlags : ").append(msgFlags).append('\n');
+        sb.append("msgSecurityModel : ").append(msgSecurityModel).append('\n');
 
         if (contextEngineId == null) {
             sb.append("contextEngineId : null");
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
--- a/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java	Tue Aug 19 21:59:21 2014 -0300
@@ -256,7 +256,7 @@
     private static String stringifyComponent(NameComponent comp) {
         StringBuilder one = new StringBuilder(escape(comp.id));
         if (comp.kind != null && !comp.kind.equals("")) {
-            one.append(kindSeparator + escape(comp.kind));
+            one.append(kindSeparator).append(escape(comp.kind));
         }
         if (one.length() == 0) {
             return ""+kindSeparator;  // if neither id nor kind specified
diff -r dde9f5cfde5f src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java
--- a/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java	Tue Aug 19 21:59:21 2014 -0300
@@ -90,7 +90,7 @@
                         if (selected == -1) {
                             StringBuilder allChoices = new StringBuilder();
                             for (int j = 0; j <  choices.length; j++) {
-                                allChoices.append(choices[j] + ",");
+                                allChoices.append(choices[j]).append(',');
                             }
                             throw new IOException("Cannot match " +
                                 "'java.naming.security.sasl.realm' property value, '" +
diff -r dde9f5cfde5f src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
--- a/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java	Tue Aug 19 21:59:21 2014 -0300
@@ -167,9 +167,9 @@
         for (int i = 0; i < allchannelnames.length; i++) {
             if ((channelmask & m) != 0L) {
                 if (i < channelnames.length) {
-                    sb.append(channelnames[i] + " ");
+                    sb.append(channelnames[i]).append(' ');
                 } else {
-                    sb.append(allchannelnames[i] + " ");
+                    sb.append(allchannelnames[i]).append(' ');
                 }
             }
             m *= 2L;
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java	Tue Aug 19 21:59:21 2014 -0300
@@ -235,14 +235,15 @@
                     String nodeName = att.getNodeName();
                     if ((nodeName.equals("xmlns") || nodeName.startsWith("xmlns:"))
                         && !storedNamespaces.containsKey(att.getNodeName())) {
-                        sb.append(" " + nodeName + "=\"" + att.getNodeValue() + "\"");
+                        sb.append(' ').append(nodeName).append("=\"")
+                        .append(att.getNodeValue()).append('"');
                         storedNamespaces.put(nodeName, att.getNodeValue());
                     }
                 }
             }
             wk = wk.getParentNode();
         }
-        sb.append(">" + source + "</dummy>");
+        sb.append('>').append(source).append("</dummy>");
         return sb.toString();
     }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java	Tue Aug 19 21:59:21 2014 -0300
@@ -85,7 +85,7 @@
             if (prefix.equals("xmlns")) {
                 sb.append("#default ");
             } else {
-                sb.append(prefix + " ");
+                sb.append(prefix).append(' ');
             }
         }
 
diff -r dde9f5cfde5f src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java
--- a/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java	Tue Aug 19 21:59:21 2014 -0300
@@ -88,7 +88,7 @@
                 l += countQuotes(DN, j, k);
 
                 if ((k > 0) && (DN.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml) + ",");
+                    sb.append(parseRDN(DN.substring(i, k).trim(), toXml)).append(',');
 
                     i = k + 1;
                     l = 0;
@@ -121,7 +121,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(parseATAV(trim(str.substring(i, k)), toXml) + "+");
+                sb.append(parseATAV(trim(str.substring(i, k)), toXml)).append('+');
 
                 i = k + 1;
                 l = 0;
@@ -369,7 +369,7 @@
         int k;
 
         for (int j = 0; (k = string.indexOf("\\20", j)) >= 0; j = k + 3) {
-            sb.append(trim(string.substring(i, k)) + "\\ ");
+            sb.append(trim(string.substring(i, k))).append("\\ ");
 
             i = k + 3;
         }
@@ -418,7 +418,7 @@
             l += countQuotes(str, j, k);
 
             if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
-                sb.append(trim(str.substring(i, k)) + replace);
+                sb.append(trim(str.substring(i, k))).append(replace);
 
                 i = k + 1;
                 l = 0;
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/CramMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/CramMD5Base.java	Tue Aug 19 21:59:21 2014 -0300
@@ -196,8 +196,7 @@
 
         for (i = 0; i < digest.length; i++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java	Tue Aug 19 21:59:21 2014 -0300
@@ -391,8 +391,7 @@
 
         for (int i = 0; i < digest.length; i ++) {
             if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0"+
-                    Integer.toHexString(digest[i] & 0x000000ff));
+                digestString.append('0').append(Integer.toHexString(digest[i] & 0x000000ff));
             } else {
                 digestString.append(
                     Integer.toHexString(digest[i] & 0x000000ff));
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/ParseException.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java	Tue Aug 19 21:59:21 2014 -0300
@@ -198,7 +198,7 @@
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                 retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
               }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
--- a/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java	Tue Aug 19 21:59:21 2014 -0300
@@ -107,7 +107,7 @@
         default:
           if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
             String s = "0000" + Integer.toString(ch, 16);
-            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+            retval.append("\\u").append(s.substring(s.length() - 4, s.length()));
           } else {
             retval.append(ch);
           }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
--- a/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java	Tue Aug 19 21:59:21 2014 -0300
@@ -338,10 +338,10 @@
             if (classpath.isEmpty()) {
                 String envcp = System.getProperty("env.class.path");
                 if ((envcp != null) && (envcp.length() > 0)) {
-                    munged.append(" -classpath " + envcp);
+                    munged.append(" -classpath ").append(envcp);
                 }
             } else {
-                munged.append(" -classpath " + classpath.asString());
+                munged.append(" -classpath ").append(classpath.asString());
             }
             return munged.toString();
         } else {
@@ -349,14 +349,4 @@
         }
     }
 
-    private String appendPath(String path1, String path2) {
-        if (path1 == null || path1.length() == 0) {
-            return path2 == null ? "." : path2;
-        } else if (path2 == null || path2.length() == 0) {
-            return path1;
-        } else {
-            return path1  + File.pathSeparator + path2;
-        }
-    }
-
 }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java	Tue Aug 19 21:59:21 2014 -0300
@@ -346,12 +346,12 @@
 
     public String valueString(boolean bigLimit) {
         // Char arrays deserve special treatment
-        StringBuffer result;
+        StringBuilder result;
         byte[] value = getValue();
         int max = value.length;
         byte elementSignature = getElementType();
         if (elementSignature == 'C')  {
-            result = new StringBuffer();
+            result = new StringBuilder();
             for (int i = 0; i < value.length; ) {
                 char val = charAt(i, value);
                 result.append(val);
@@ -362,7 +362,7 @@
             if (bigLimit) {
                 limit = 1000;
             }
-            result = new StringBuffer("{");
+            result = new StringBuilder("{");
             int num = 0;
             for (int i = 0; i < value.length; ) {
                 if (num > 0) {
@@ -386,37 +386,37 @@
                     }
                     case 'B': {
                         int val = 0xFF & byteAt(i, value);
-                        result.append("0x" + Integer.toString(val, 16));
+                        result.append("0x").append(Integer.toString(val, 16));
                         i++;
                         break;
                     }
                     case 'S': {
                         short val = shortAt(i, value);
                         i += 2;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'I': {
                         int val = intAt(i, value);
                         i += 4;
-                        result.append("" + val);
+                        result.append(val);
                         break;
                     }
                     case 'J': {         // long
                         long val = longAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
                     case 'F': {
                         float val = floatAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 4;
                         break;
                     }
                     case 'D': {         // double
                         double val = doubleAt(i, value);
-                        result.append("" + val);
+                        result.append(val);
                         i += 8;
                         break;
                     }
@@ -425,7 +425,7 @@
                     }
                 }
             }
-            result.append("}");
+            result.append('}');
         }
         return result.toString();
     }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/hat/internal/util/Misc.java
--- a/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/Misc.java	Tue Aug 19 21:59:21 2014 -0300
@@ -97,11 +97,11 @@
             } else if (ch == '&') {
                 sb.append("&amp;");
             } else if (ch < ' ') {
-                sb.append("&#" + Integer.toString(ch) + ";");
+                sb.append("&#").append(Integer.toString(ch)).append(';');
             } else {
                 int c = (ch & 0xFFFF);
                 if (c > 127) {
-                    sb.append("&#" + Integer.toString(c) + ";");
+                    sb.append("&#").append(Integer.toString(c)).append(';');
                 } else {
                     sb.append(ch);
                 }
diff -r dde9f5cfde5f src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
--- a/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Tue Aug 05 19:29:00 2014 -0700
+++ b/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Tue Aug 19 21:59:21 2014 -0300
@@ -881,12 +881,12 @@
             } else if (tag == JDWP.TypeTag.ARRAY) {
                 sb.append("ArrayType");
             } else {
-                sb.append("UNKNOWN TAG: " + tag);
+                sb.append("UNKNOWN TAG: ").append(tag);
             }
             if (signature != null) {
-                sb.append(", signature='" + signature + "'");
+                sb.append(", signature='").append(signature).append('\'');
             }
-            sb.append(", id=" + id);
+            sb.append(", id=").append(id);
             vm.printTrace(sb.toString());
         }
         if (id == 0) {

From weijun.wang at oracle.com  Wed Aug 20 01:55:39 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Wed, 20 Aug 2014 09:55:39 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
Message-ID: <8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>

Hi Ot?vio

I see TABs in the first page of sun_security.diff, too long line in javax_security.diff.

Also, it's unfortunate that you will need to rename the file names to the new style with modules. See http://cr.openjdk.java.net/~chegar/docs/portingScript.html for how to do this.

I can create webrev page(s) for you on cr.openjdk.java.net. Please tell me if you want a big one or one for each diff.

I see no bug id. If none, I can create one for you.

Thanks
Max

On Aug 20, 2014, at 9:05, Ot?vio Gon?alves de Santana <otaviojava at java.net> wrote:

> Thank you Sergey.
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_7.zip
> 
> 
> On Tue, Aug 19, 2014 at 12:32 PM, Sergey Bylokhov <
> Sergey.Bylokhov at oracle.com> wrote:
> 
>> Hi Ot?vio,
>> The new alignment in DataLine.java/JColorChooser.java looks strange.
>> Wrong change in BasicTableUI.java:
>> -                    plainStr.deleteCharAt(plainStr.length() -
>> 1).append("\n");
>> +                    plainStr.deleteCharAt(plainStr.length() -
>> 1).append('\t');
>> 
>> 
>> On 13.08.2014 3:01, Ot?vio Gon?alves de Santana wrote:
>> 
>>> Thank you Roger.
>>> Done
>>> https://dl.dropboxusercontent.com/u/16109193/open_jdk/
>>> string_builder_concat_6.zip
>>> 
>>> 
>>> On Tue, Aug 12, 2014 at 10:15 AM, roger riggs <roger.riggs at oracle.com>
>>> wrote:
>>> 
>>> fyi,
>>>> 
>>>> There's a Perl script normalizer.pl that detects/fixes most of the
>>>> simple
>>>> tab/white space issues.
>>>> The script is in the <repo>/make/scripts/normalizer.pl
>>>> 
>>>> Roger
>>>> 
>>>> 
>>>> On 8/12/2014 3:48 AM, Andrej Golovnin wrote:
>>>> 
>>>> Hi Ot?vio,
>>>>> 
>>>>> I think you should fix the indentation in a lot of classes. You use the
>>>>> tab-character for the indentation. As far as I know we should use the
>>>>> space
>>>>> character for the indentation in the JDK sources (Oracle devs feel free
>>>>> to
>>>>> correct me if I'm wrong. And it would be really nice if the style guide
>>>>> for
>>>>> the source code would be a part of the JDK repository. So we don't need
>>>>> to
>>>>> search for it on the internet/wiki. Just clone the repository, read the
>>>>> style guide and follow it. :-) ). Here is the not complete list of
>>>>> classes
>>>>> where you used the tab-character for the indentation:
>>>>> 
>>>>> src/share/classes/com/sun/crypto/provider/OAEPParameters.java
>>>>> src/share/classes/java/lang/management/MemoryUsage.java
>>>>> src/share/classes/java/security/KeyStore.java
>>>>> src/share/classes/java/security/PermissionCollection.java
>>>>> src/share/classes/java/security/ProtectionDomain.java
>>>>> src/share/classes/java/security/cert/CertPath.java
>>>>> src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
>>>>> src/share/classes/java/security/cert/PKIXParameters.java
>>>>> src/share/classes/java/security/cert/PolicyQualifierInfo.java
>>>>> src/share/classes/java/security/cert/TrustAnchor.java
>>>>> src/share/classes/java/security/cert/X509CertSelector.java
>>>>> src/share/classes/javax/crypto/CryptoPermission.java
>>>>> src/share/classes/javax/management/relation/Role.java
>>>>> 
>>>>> 
>>>>> In src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj in the line 423 a
>>>>> dot
>>>>> is missed before append:
>>>>> 
>>>>> 423   {jjtn000.name.append( '.')append(t.image); }
>>>>> 
>>>>> Best regards,
>>>>> Andrej Golovnin
>>>>> 
>>>>> 
>>>> 
>>> 
>> 
>> --
>> Best regards, Sergey.
>> 
>> 
> 
> 
> -- 
> Ot?vio Gon?alves de Santana
> 
> blog:     http://otaviosantana.blogspot.com.br/
> twitter: http://twitter.com/otaviojava
> site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
> 55 (11) 98255-3513
> <sun_tools.diff><sun_security.diff><sun_net.diff><sun_management.diff><sun_launcher.diff><sun_font.diff><javax_swing.diff><javax_sound.diff><javax_security.diff><javax_naming.diff><javax_crypto.diff><javax_,anagement.diff><java_util.diff><java_text.diff><java_security.diff><java_rmi.diff><java_lang.diff><com_sun.diff>



From alexey.ivanov at oracle.com  Wed Aug 20 13:35:25 2014
From: alexey.ivanov at oracle.com (Alexey Ivanov)
Date: Wed, 20 Aug 2014 17:35:25 +0400
Subject: <Swing Dev> [7u-dev] Request for approval for JDK-8043610: Sorting
 columns in JFileChooser fails with AppContext NPE
Message-ID: <53F4A41D.4020804@oracle.com>

Hello,

Please approve the backport of the fix to jdk7u-dev.

I replaced lambda expressions and method reference with anonymous classes:

     webrev: http://cr.openjdk.java.net/~aivanov/8043610/jdk7/webrev.00/


AWT and Swing teams,

Could you please review the backport?

JBS bug: https://bugs.openjdk.java.net/browse/JDK-8043610
JDK9 review: 
http://mail.openjdk.java.net/pipermail/awt-dev/2014-May/007846.html
JDK9 webrev: http://cr.openjdk.java.net/~pchelko/9/8043610/webrev/

JDK9 changeset: http://hg.openjdk.java.net/jdk9/client/jdk/rev/604abecf62c2
JDK8 changeset: 
http://hg.openjdk.java.net/jdk8u/jdk8u-dev/jdk/rev/b20c4785bb81


Thank you in advance,
Alexey.


From anthony.petrov at oracle.com  Wed Aug 20 13:44:01 2014
From: anthony.petrov at oracle.com (Anthony Petrov)
Date: Wed, 20 Aug 2014 17:44:01 +0400
Subject: <Swing Dev> [7u-dev] Request for approval for JDK-8043610:
 Sorting columns in JFileChooser fails with AppContext NPE
In-Reply-To: <53F4A41D.4020804@oracle.com>
References: <53F4A41D.4020804@oracle.com>
Message-ID: <53F4A621.1070905@oracle.com>

Looks fine. +1

--
best regards,
Anthony

On 8/20/2014 5:35 PM, Alexey Ivanov wrote:
> Hello,
>
> Please approve the backport of the fix to jdk7u-dev.
>
> I replaced lambda expressions and method reference with anonymous classes:
>
>      webrev: http://cr.openjdk.java.net/~aivanov/8043610/jdk7/webrev.00/
>
>
> AWT and Swing teams,
>
> Could you please review the backport?
>
> JBS bug: https://bugs.openjdk.java.net/browse/JDK-8043610
> JDK9 review:
> http://mail.openjdk.java.net/pipermail/awt-dev/2014-May/007846.html
> JDK9 webrev: http://cr.openjdk.java.net/~pchelko/9/8043610/webrev/
>
> JDK9 changeset: http://hg.openjdk.java.net/jdk9/client/jdk/rev/604abecf62c2
> JDK8 changeset:
> http://hg.openjdk.java.net/jdk8u/jdk8u-dev/jdk/rev/b20c4785bb81
>
>
> Thank you in advance,
> Alexey.


From sean.coffey at oracle.com  Wed Aug 20 14:10:19 2014
From: sean.coffey at oracle.com (=?UTF-8?B?U2XDoW4gQ29mZmV5?=)
Date: Wed, 20 Aug 2014 15:10:19 +0100
Subject: <Swing Dev> [7u-dev] Request for approval for JDK-8043610:
 Sorting columns in JFileChooser fails with AppContext NPE
In-Reply-To: <53F4A621.1070905@oracle.com>
References: <53F4A41D.4020804@oracle.com> <53F4A621.1070905@oracle.com>
Message-ID: <53F4AC4B.2080506@oracle.com>

Approved.

regards,
Sean.

On 20/08/14 14:44, Anthony Petrov wrote:
> Looks fine. +1
>
> -- 
> best regards,
> Anthony
>
> On 8/20/2014 5:35 PM, Alexey Ivanov wrote:
>> Hello,
>>
>> Please approve the backport of the fix to jdk7u-dev.
>>
>> I replaced lambda expressions and method reference with anonymous 
>> classes:
>>
>>      webrev: http://cr.openjdk.java.net/~aivanov/8043610/jdk7/webrev.00/
>>
>>
>> AWT and Swing teams,
>>
>> Could you please review the backport?
>>
>> JBS bug: https://bugs.openjdk.java.net/browse/JDK-8043610
>> JDK9 review:
>> http://mail.openjdk.java.net/pipermail/awt-dev/2014-May/007846.html
>> JDK9 webrev: http://cr.openjdk.java.net/~pchelko/9/8043610/webrev/
>>
>> JDK9 changeset: 
>> http://hg.openjdk.java.net/jdk9/client/jdk/rev/604abecf62c2
>> JDK8 changeset:
>> http://hg.openjdk.java.net/jdk8u/jdk8u-dev/jdk/rev/b20c4785bb81
>>
>>
>> Thank you in advance,
>> Alexey.



From otaviojava at java.net  Thu Aug 21 02:32:14 2014
From: otaviojava at java.net (=?UTF-8?Q?Ot=C3=A1vio_Gon=C3=A7alves_de_Santana?=)
Date: Wed, 20 Aug 2014 23:32:14 -0300
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
Message-ID: <CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>

Thank you Wang.
Actually I haven't neither webrev and bug id.
I believe is better split in client and server code.
https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_8.zip


On Tue, Aug 19, 2014 at 10:55 PM, Wang Weijun <weijun.wang at oracle.com>
wrote:

> Hi Ot?vio
>
> I see TABs in the first page of sun_security.diff, too long line in
> javax_security.diff.
>
> Also, it's unfortunate that you will need to rename the file names to the
> new style with modules. See
> http://cr.openjdk.java.net/~chegar/docs/portingScript.html for how to do
> this.
>
> I can create webrev page(s) for you on cr.openjdk.java.net. Please tell
> me if you want a big one or one for each diff.
>
> I see no bug id. If none, I can create one for you.
>
> Thanks
> Max
>
> On Aug 20, 2014, at 9:05, Ot?vio Gon?alves de Santana <otaviojava at java.net>
> wrote:
>
> > Thank you Sergey.
> >
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_7.zip
> >
> >
> > On Tue, Aug 19, 2014 at 12:32 PM, Sergey Bylokhov <
> > Sergey.Bylokhov at oracle.com> wrote:
> >
> >> Hi Ot?vio,
> >> The new alignment in DataLine.java/JColorChooser.java looks strange.
> >> Wrong change in BasicTableUI.java:
> >> -                    plainStr.deleteCharAt(plainStr.length() -
> >> 1).append("\n");
> >> +                    plainStr.deleteCharAt(plainStr.length() -
> >> 1).append('\t');
> >>
> >>
> >> On 13.08.2014 3:01, Ot?vio Gon?alves de Santana wrote:
> >>
> >>> Thank you Roger.
> >>> Done
> >>> https://dl.dropboxusercontent.com/u/16109193/open_jdk/
> >>> string_builder_concat_6.zip
> >>>
> >>>
> >>> On Tue, Aug 12, 2014 at 10:15 AM, roger riggs <roger.riggs at oracle.com>
> >>> wrote:
> >>>
> >>> fyi,
> >>>>
> >>>> There's a Perl script normalizer.pl that detects/fixes most of the
> >>>> simple
> >>>> tab/white space issues.
> >>>> The script is in the <repo>/make/scripts/normalizer.pl
> >>>>
> >>>> Roger
> >>>>
> >>>>
> >>>> On 8/12/2014 3:48 AM, Andrej Golovnin wrote:
> >>>>
> >>>> Hi Ot?vio,
> >>>>>
> >>>>> I think you should fix the indentation in a lot of classes. You use
> the
> >>>>> tab-character for the indentation. As far as I know we should use the
> >>>>> space
> >>>>> character for the indentation in the JDK sources (Oracle devs feel
> free
> >>>>> to
> >>>>> correct me if I'm wrong. And it would be really nice if the style
> guide
> >>>>> for
> >>>>> the source code would be a part of the JDK repository. So we don't
> need
> >>>>> to
> >>>>> search for it on the internet/wiki. Just clone the repository, read
> the
> >>>>> style guide and follow it. :-) ). Here is the not complete list of
> >>>>> classes
> >>>>> where you used the tab-character for the indentation:
> >>>>>
> >>>>> src/share/classes/com/sun/crypto/provider/OAEPParameters.java
> >>>>> src/share/classes/java/lang/management/MemoryUsage.java
> >>>>> src/share/classes/java/security/KeyStore.java
> >>>>> src/share/classes/java/security/PermissionCollection.java
> >>>>> src/share/classes/java/security/ProtectionDomain.java
> >>>>> src/share/classes/java/security/cert/CertPath.java
> >>>>> src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
> >>>>> src/share/classes/java/security/cert/PKIXParameters.java
> >>>>> src/share/classes/java/security/cert/PolicyQualifierInfo.java
> >>>>> src/share/classes/java/security/cert/TrustAnchor.java
> >>>>> src/share/classes/java/security/cert/X509CertSelector.java
> >>>>> src/share/classes/javax/crypto/CryptoPermission.java
> >>>>> src/share/classes/javax/management/relation/Role.java
> >>>>>
> >>>>>
> >>>>> In src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj in the line
> 423 a
> >>>>> dot
> >>>>> is missed before append:
> >>>>>
> >>>>> 423   {jjtn000.name.append( '.')append(t.image); }
> >>>>>
> >>>>> Best regards,
> >>>>> Andrej Golovnin
> >>>>>
> >>>>>
> >>>>
> >>>
> >>
> >> --
> >> Best regards, Sergey.
> >>
> >>
> >
> >
> > --
> > Ot?vio Gon?alves de Santana
> >
> > blog:     http://otaviosantana.blogspot.com.br/
> > twitter: http://twitter.com/otaviojava
> > site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
> > 55 (11) 98255-3513
> >
> <sun_tools.diff><sun_security.diff><sun_net.diff><sun_management.diff><sun_launcher.diff><sun_font.diff><javax_swing.diff><javax_sound.diff><javax_security.diff><javax_naming.diff><javax_crypto.diff><javax_,anagement.diff><java_util.diff><java_text.diff><java_security.diff><java_rmi.diff><java_lang.diff><com_sun.diff>
>
>


-- 
Ot?vio Gon?alves de Santana

blog:     http://otaviosantana.blogspot.com.br/
twitter: http://twitter.com/otaviojava
site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
55 (11) 98255-3513
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140820/77939360/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: string_concat_updated.patch
Type: text/x-patch
Size: 152472 bytes
Desc: not available
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140820/77939360/string_concat_updated.patch>

From dmitry.markov at oracle.com  Thu Aug 21 09:03:55 2014
From: dmitry.markov at oracle.com (dmitry markov)
Date: Thu, 21 Aug 2014 13:03:55 +0400
Subject: <Swing Dev> [9] Review request for 8048110: Using tables in
 JTextPane leads to infinite loop in FlowLayout.layoutRow
In-Reply-To: <53F1B4FA.4080009@oracle.com>
References: <50d74d59-9ebb-4c8b-8e8f-1f4e17bf1074@default>
	<53F1B4FA.4080009@oracle.com>
Message-ID: <53F5B5FB.9070702@oracle.com>

Hello,

Reminder. Could you review this, please?

Thanks,
Dmitry
On 18/08/2014 12:10, dmitry markov wrote:
> Hello Sergey,
>
> LogicalView.forwardUpdate() sends update event to all views followed 
> by the changed place. This event will cause view to drop the cache and 
> re-calculate its break points. This method was added under JDK-8024395 
> <https://bugs.openjdk.java.net/browse/JDK-8024395> and intended for 
> the documents contained only text elements. The current implementation 
> does not expect that non-text element, (e.g. a table) can be added to 
> the document.
> If the table is added to the document with flow layout, the invocation 
> of LogicalView.forwardUpdate() will produce some negative visual 
> effects (table will be displayed several times). In case of replacing 
> the text by the table the situation much worse, since the FlowView 
> will try to re-layout the removed text and hangs.
>
> We have to send the update events to all instances of GlyphView 
> followed by changed place for proper text line breaks calculation, see 
> JDK-8024395 <https://bugs.openjdk.java.net/browse/JDK-8024395>, 
> JDK-8014863 <https://bugs.openjdk.java.net/browse/JDK-8014863>. That's 
> why I added checks for GlyphView instance. I understand this might be 
> not a good place, but only here we have information about all views in 
> the document and can forward update to them, if any.
> Please note another approach to solve the problems with line breaks 
> calculation - re-calculate break spots any time when a view is laid 
> out. As far as I know it is used in jdk6, but this solution is not 
> suitable, since it causes serious performance problems in case of 
> large documents.
>
> Also I have updated the fix. New version - 
> http://cr.openjdk.java.net/~dmarkov/8048110/jdk9/webrev.01/
> Now LogicalView.forwardUpdate() sends update only to GlyphView 
> followed by the changed place. This resolves the problem when the 
> table is located in the middle of the text line.
>
> Thanks,
> Dmitry
>
> On 15/08/2014 12:56, Sergey Bylokhov wrote:
>> Hello, Dmitry.
>>>> The LogicalView.forwardUpdate() should send an update event to the views
>>>> followed by the changed place, only when an instance of GlyphView has
>>>> changed; otherwise it should invoke View.forwardUpdate() to handle the
>>>> update properly.
>> Can you share additional information about the fix. Why LogicalView should send an update if GlyphView was changed only. Because before the fix LocalView knows nothing about GlyphView.
>>
>> Thanks,
>> Dmitry
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140821/f4f2781c/attachment.html>

From weijun.wang at oracle.com  Thu Aug 21 12:53:54 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Thu, 21 Aug 2014 20:53:54 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>
Message-ID: <EB3B6783-938E-4130-A92F-0F289672A023@oracle.com>

I filed a bug at

   https://bugs.openjdk.java.net/browse/JDK-8038277

Webrev in 3 parts at

   http://cr.openjdk.java.net/~weijun/8038277/client/webrev.00
   http://cr.openjdk.java.net/~weijun/8038277/core/webrev.00/
   http://cr.openjdk.java.net/~weijun/8038277/extra/webrev.00/

--Max

On Aug 21, 2014, at 10:32, Ot?vio Gon?alves de Santana <otaviojava at java.net> wrote:

> Thank you Wang.
> Actually I haven't neither webrev and bug id.
> I believe is better split in client and server code.
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_8.zip
> 
> 
> On Tue, Aug 19, 2014 at 10:55 PM, Wang Weijun <weijun.wang at oracle.com> wrote:
> Hi Ot?vio
> 
> I see TABs in the first page of sun_security.diff, too long line in javax_security.diff.
> 
> Also, it's unfortunate that you will need to rename the file names to the new style with modules. See http://cr.openjdk.java.net/~chegar/docs/portingScript.html for how to do this.
> 
> I can create webrev page(s) for you on cr.openjdk.java.net. Please tell me if you want a big one or one for each diff.
> 
> I see no bug id. If none, I can create one for you.
> 
> Thanks
> Max
> 
> On Aug 20, 2014, at 9:05, Ot?vio Gon?alves de Santana <otaviojava at java.net> wrote:
> 
> > Thank you Sergey.
> > https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_7.zip
> >
> >
> > On Tue, Aug 19, 2014 at 12:32 PM, Sergey Bylokhov <
> > Sergey.Bylokhov at oracle.com> wrote:
> >
> >> Hi Ot?vio,
> >> The new alignment in DataLine.java/JColorChooser.java looks strange.
> >> Wrong change in BasicTableUI.java:
> >> -                    plainStr.deleteCharAt(plainStr.length() -
> >> 1).append("\n");
> >> +                    plainStr.deleteCharAt(plainStr.length() -
> >> 1).append('\t');
> >>
> >>
> >> On 13.08.2014 3:01, Ot?vio Gon?alves de Santana wrote:
> >>
> >>> Thank you Roger.
> >>> Done
> >>> https://dl.dropboxusercontent.com/u/16109193/open_jdk/
> >>> string_builder_concat_6.zip
> >>>
> >>>
> >>> On Tue, Aug 12, 2014 at 10:15 AM, roger riggs <roger.riggs at oracle.com>
> >>> wrote:
> >>>
> >>> fyi,
> >>>>
> >>>> There's a Perl script normalizer.pl that detects/fixes most of the
> >>>> simple
> >>>> tab/white space issues.
> >>>> The script is in the <repo>/make/scripts/normalizer.pl
> >>>>
> >>>> Roger
> >>>>
> >>>>
> >>>> On 8/12/2014 3:48 AM, Andrej Golovnin wrote:
> >>>>
> >>>> Hi Ot?vio,
> >>>>>
> >>>>> I think you should fix the indentation in a lot of classes. You use the
> >>>>> tab-character for the indentation. As far as I know we should use the
> >>>>> space
> >>>>> character for the indentation in the JDK sources (Oracle devs feel free
> >>>>> to
> >>>>> correct me if I'm wrong. And it would be really nice if the style guide
> >>>>> for
> >>>>> the source code would be a part of the JDK repository. So we don't need
> >>>>> to
> >>>>> search for it on the internet/wiki. Just clone the repository, read the
> >>>>> style guide and follow it. :-) ). Here is the not complete list of
> >>>>> classes
> >>>>> where you used the tab-character for the indentation:
> >>>>>
> >>>>> src/share/classes/com/sun/crypto/provider/OAEPParameters.java
> >>>>> src/share/classes/java/lang/management/MemoryUsage.java
> >>>>> src/share/classes/java/security/KeyStore.java
> >>>>> src/share/classes/java/security/PermissionCollection.java
> >>>>> src/share/classes/java/security/ProtectionDomain.java
> >>>>> src/share/classes/java/security/cert/CertPath.java
> >>>>> src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
> >>>>> src/share/classes/java/security/cert/PKIXParameters.java
> >>>>> src/share/classes/java/security/cert/PolicyQualifierInfo.java
> >>>>> src/share/classes/java/security/cert/TrustAnchor.java
> >>>>> src/share/classes/java/security/cert/X509CertSelector.java
> >>>>> src/share/classes/javax/crypto/CryptoPermission.java
> >>>>> src/share/classes/javax/management/relation/Role.java
> >>>>>
> >>>>>
> >>>>> In src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj in the line 423 a
> >>>>> dot
> >>>>> is missed before append:
> >>>>>
> >>>>> 423   {jjtn000.name.append( '.')append(t.image); }
> >>>>>
> >>>>> Best regards,
> >>>>> Andrej Golovnin
> >>>>>
> >>>>>
> >>>>
> >>>
> >>
> >> --
> >> Best regards, Sergey.
> >>
> >>
> >
> >
> > --
> > Ot?vio Gon?alves de Santana
> >
> > blog:     http://otaviosantana.blogspot.com.br/
> > twitter: http://twitter.com/otaviojava
> > site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
> > 55 (11) 98255-3513
> > <sun_tools.diff><sun_security.diff><sun_net.diff><sun_management.diff><sun_launcher.diff><sun_font.diff><javax_swing.diff><javax_sound.diff><javax_security.diff><javax_naming.diff><javax_crypto.diff><javax_,anagement.diff><java_util.diff><java_text.diff><java_security.diff><java_rmi.diff><java_lang.diff><com_sun.diff>
> 
> 
> 
> 
> -- 
> Ot?vio Gon?alves de Santana
> 
> blog:     http://otaviosantana.blogspot.com.br/
> twitter: http://twitter.com/otaviojava
> site:     http://about.me/otaviojava
> 55 (11) 98255-3513
> <string_concat_updated.patch>



From andrej.golovnin at gmail.com  Thu Aug 21 13:18:19 2014
From: andrej.golovnin at gmail.com (Andrej Golovnin)
Date: Thu, 21 Aug 2014 15:18:19 +0200
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <EB3B6783-938E-4130-A92F-0F289672A023@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>
	<EB3B6783-938E-4130-A92F-0F289672A023@oracle.com>
Message-ID: <CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>

>
>    https://bugs.openjdk.java.net/browse/JDK-8038277


This is not the right bug report. The subject of this bug report is
"Improve the bootstrap performance of carets keystore".


>
>    http://cr.openjdk.java.net/~weijun/8038277/client/webrev.00


TABs are still used for indentation. I looked only
at src/java.desktop/share/classes/javax/swing/RepaintManager.java.

Best regards,
Andrej Golovnin


>
>    http://cr.openjdk.java.net/~weijun/8038277/core/webrev.00/
>    http://cr.openjdk.java.net/~weijun/8038277/extra/webrev.00/
>
> --Max
>
> On Aug 21, 2014, at 10:32, Ot?vio Gon?alves de Santana <
> otaviojava at java.net> wrote:
>
> > Thank you Wang.
> > Actually I haven't neither webrev and bug id.
> > I believe is better split in client and server code.
> >
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_8.zip
> >
> >
> > On Tue, Aug 19, 2014 at 10:55 PM, Wang Weijun <weijun.wang at oracle.com>
> wrote:
> > Hi Ot?vio
> >
> > I see TABs in the first page of sun_security.diff, too long line in
> javax_security.diff.
> >
> > Also, it's unfortunate that you will need to rename the file names to
> the new style with modules. See
> http://cr.openjdk.java.net/~chegar/docs/portingScript.html for how to do
> this.
> >
> > I can create webrev page(s) for you on cr.openjdk.java.net. Please tell
> me if you want a big one or one for each diff.
> >
> > I see no bug id. If none, I can create one for you.
> >
> > Thanks
> > Max
> >
> > On Aug 20, 2014, at 9:05, Ot?vio Gon?alves de Santana <
> otaviojava at java.net> wrote:
> >
> > > Thank you Sergey.
> > >
> https://dl.dropboxusercontent.com/u/16109193/open_jdk/string_builder_concat_7.zip
> > >
> > >
> > > On Tue, Aug 19, 2014 at 12:32 PM, Sergey Bylokhov <
> > > Sergey.Bylokhov at oracle.com> wrote:
> > >
> > >> Hi Ot?vio,
> > >> The new alignment in DataLine.java/JColorChooser.java looks strange.
> > >> Wrong change in BasicTableUI.java:
> > >> -                    plainStr.deleteCharAt(plainStr.length() -
> > >> 1).append("\n");
> > >> +                    plainStr.deleteCharAt(plainStr.length() -
> > >> 1).append('\t');
> > >>
> > >>
> > >> On 13.08.2014 3:01, Ot?vio Gon?alves de Santana wrote:
> > >>
> > >>> Thank you Roger.
> > >>> Done
> > >>> https://dl.dropboxusercontent.com/u/16109193/open_jdk/
> > >>> string_builder_concat_6.zip
> > >>>
> > >>>
> > >>> On Tue, Aug 12, 2014 at 10:15 AM, roger riggs <
> roger.riggs at oracle.com>
> > >>> wrote:
> > >>>
> > >>> fyi,
> > >>>>
> > >>>> There's a Perl script normalizer.pl that detects/fixes most of the
> > >>>> simple
> > >>>> tab/white space issues.
> > >>>> The script is in the <repo>/make/scripts/normalizer.pl
> > >>>>
> > >>>> Roger
> > >>>>
> > >>>>
> > >>>> On 8/12/2014 3:48 AM, Andrej Golovnin wrote:
> > >>>>
> > >>>> Hi Ot?vio,
> > >>>>>
> > >>>>> I think you should fix the indentation in a lot of classes. You
> use the
> > >>>>> tab-character for the indentation. As far as I know we should use
> the
> > >>>>> space
> > >>>>> character for the indentation in the JDK sources (Oracle devs feel
> free
> > >>>>> to
> > >>>>> correct me if I'm wrong. And it would be really nice if the style
> guide
> > >>>>> for
> > >>>>> the source code would be a part of the JDK repository. So we don't
> need
> > >>>>> to
> > >>>>> search for it on the internet/wiki. Just clone the repository,
> read the
> > >>>>> style guide and follow it. :-) ). Here is the not complete list of
> > >>>>> classes
> > >>>>> where you used the tab-character for the indentation:
> > >>>>>
> > >>>>> src/share/classes/com/sun/crypto/provider/OAEPParameters.java
> > >>>>> src/share/classes/java/lang/management/MemoryUsage.java
> > >>>>> src/share/classes/java/security/KeyStore.java
> > >>>>> src/share/classes/java/security/PermissionCollection.java
> > >>>>> src/share/classes/java/security/ProtectionDomain.java
> > >>>>> src/share/classes/java/security/cert/CertPath.java
> > >>>>> src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
> > >>>>> src/share/classes/java/security/cert/PKIXParameters.java
> > >>>>> src/share/classes/java/security/cert/PolicyQualifierInfo.java
> > >>>>> src/share/classes/java/security/cert/TrustAnchor.java
> > >>>>> src/share/classes/java/security/cert/X509CertSelector.java
> > >>>>> src/share/classes/javax/crypto/CryptoPermission.java
> > >>>>> src/share/classes/javax/management/relation/Role.java
> > >>>>>
> > >>>>>
> > >>>>> In src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj in the line
> 423 a
> > >>>>> dot
> > >>>>> is missed before append:
> > >>>>>
> > >>>>> 423   {jjtn000.name.append( '.')append(t.image); }
> > >>>>>
> > >>>>> Best regards,
> > >>>>> Andrej Golovnin
> > >>>>>
> > >>>>>
> > >>>>
> > >>>
> > >>
> > >> --
> > >> Best regards, Sergey.
> > >>
> > >>
> > >
> > >
> > > --
> > > Ot?vio Gon?alves de Santana
> > >
> > > blog:     http://otaviosantana.blogspot.com.br/
> > > twitter: http://twitter.com/otaviojava
> > > site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
> > > 55 (11) 98255-3513
> > >
> <sun_tools.diff><sun_security.diff><sun_net.diff><sun_management.diff><sun_launcher.diff><sun_font.diff><javax_swing.diff><javax_sound.diff><javax_security.diff><javax_naming.diff><javax_crypto.diff><javax_,anagement.diff><java_util.diff><java_text.diff><java_security.diff><java_rmi.diff><java_lang.diff><com_sun.diff>
> >
> >
> >
> >
> > --
> > Ot?vio Gon?alves de Santana
> >
> > blog:     http://otaviosantana.blogspot.com.br/
> > twitter: http://twitter.com/otaviojava
> > site:     http://about.me/otaviojava
> > 55 (11) 98255-3513
> > <string_concat_updated.patch>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140821/4502cda9/attachment.html>

From andrej.golovnin at gmail.com  Thu Aug 21 13:37:54 2014
From: andrej.golovnin at gmail.com (Andrej Golovnin)
Date: Thu, 21 Aug 2014 15:37:54 +0200
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <53F5F371.7070401@geomatys.fr>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>
	<EB3B6783-938E-4130-A92F-0F289672A023@oracle.com>
	<53F5F371.7070401@geomatys.fr>
Message-ID: <CAM6ZMz8E4i39AggKj2ARRkZz0EYosFqyuU7n-KFdK476svHFMQ@mail.gmail.com>

Hi Martin,

you are right. And in the line 297:

297         sb.append(getClass().getName()).append('
').append(Integer.toString(hashCode()));

Integer.toString() can be removed too.

Best regards,
Andrej Golovnin

On Thu, Aug 21, 2014 at 3:26 PM, Martin Desruisseaux <
martin.desruisseaux at geomatys.fr> wrote:

> I had a random look at the Webrev for TreeModelEvent.java and saw the
> following new code:
>
>     sb.append(Integer.toString(childIndices[counter]))
>
> Wouldn't the following be slightly more efficient?
>
>     sb.append(childIndices[counter])
>
> since Integer.toString(int) creates a temporary char[] array later
> copied in the StringBuilder, while StringBuilder.append(int) writes
> directly in the buffer internal array.
>
>
>     Martin
>
>
>
> Le 21/08/14 14:53, Wang Weijun a ?crit :
> > I filed a bug at
> >
> >    https://bugs.openjdk.java.net/browse/JDK-8038277
> >
> > Webrev in 3 parts at
> >
> >    http://cr.openjdk.java.net/~weijun/8038277/client/webrev.00
> >    http://cr.openjdk.java.net/~weijun/8038277/core/webrev.00/
> >    http://cr.openjdk.java.net/~weijun/8038277/extra/webrev.00/
> >
> > --Max
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140821/527a8a83/attachment.html>

From weijun.wang at oracle.com  Thu Aug 21 14:13:59 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Thu, 21 Aug 2014 22:13:59 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>
	<EB3B6783-938E-4130-A92F-0F289672A023@oracle.co!
	m> <CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>
Message-ID: <739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>


On Aug 21, 2014, at 21:18, Andrej Golovnin <andrej.golovnin at gmail.com> wrote:

>    https://bugs.openjdk.java.net/browse/JDK-8038277
> 
> This is not the right bug report. The subject of this bug report is "Improve the bootstrap performance of carets keystore".

Oh, my mistake, it should be https://bugs.openjdk.java.net/browse/JDK-8055723. Will update it in the next round of webrev.

>  
> 
>    http://cr.openjdk.java.net/~weijun/8038277/client/webrev.00
> 
> TABs are still used for indentation. I looked only at src/java.desktop/share/classes/javax/swing/RepaintManager.java.

My mistake again. In order to create 3 changesets for a single bug id, I turned off jcheck.

These files includes TABs:

client:

Warning: src/java.desktop/share/classes/javax/swing/GroupLayout.java:1242: Tab character
Warning: src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java:193: Tab character
Warning: src/java.desktop/share/classes/javax/swing/RepaintManager.java:993: Tab character

core:

Warning: src/java.base/share/classes/java/security/ProtectionDomain.java:288: Tab character
Warning: src/java.base/share/classes/sun/launcher/LauncherHelper.java:372: Tab character
Warning: src/java.base/share/classes/sun/net/www/HeaderParser.java:224: Tab character
Warning: src/java.base/share/classes/sun/security/provider/PolicyFile.java:1488: Tab character
Warning: src/java.base/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java:115: Tab character

extra:

Warning: src/java.management/share/classes/java/lang/management/ThreadInfo.java:582: Tab character
Warning: src/jdk.dev/share/classes/sun/security/tools/jarsigner/Main.java:707: Tab character
Warning: src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java:99: Tab character
Warning: src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java:494: Tab character

Thanks
Max



From weijun.wang at oracle.com  Thu Aug 21 15:04:28 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Thu, 21 Aug 2014 23:04:28 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>
	<EB3B6783-938E-4130-A92F-0F289672A023@oracle.co!
	m> <CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>
	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>
Message-ID: <4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>

I also see a lot of .toString() and String.valueOf() calls.

$ cat string_concat_updated.patch | perl -ne 'print if /^\+ .*append.*(String\.valueOf|\.toString\(\))/' | wc
      62     210    4626

Wrapped lines not indented correctly in

src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
src/java.base/share/classes/com/sun/crypto/provider/DHParameters.java
src/java.base/share/classes/com/sun/crypto/provider/DHPublicKey.java
src/java.base/share/classes/com/sun/crypto/provider/GCMParameters.java

--Max

From alexandr.scherbatiy at oracle.com  Fri Aug 22 08:29:37 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Fri, 22 Aug 2014 12:29:37 +0400
Subject: <Swing Dev> [7u-dev] Request for approval for JDK-8043610:
 Sorting columns in JFileChooser fails with AppContext NPE
In-Reply-To: <53F4A41D.4020804@oracle.com>
References: <53F4A41D.4020804@oracle.com>
Message-ID: <53F6FF71.8080307@oracle.com>


   The fix looks good to me.

   Thanks,
   Alexandr.

On 8/20/2014 5:35 PM, Alexey Ivanov wrote:
> Hello,
>
> Please approve the backport of the fix to jdk7u-dev.
>
> I replaced lambda expressions and method reference with anonymous 
> classes:
>
>     webrev: http://cr.openjdk.java.net/~aivanov/8043610/jdk7/webrev.00/
>
>
> AWT and Swing teams,
>
> Could you please review the backport?
>
> JBS bug: https://bugs.openjdk.java.net/browse/JDK-8043610
> JDK9 review: 
> http://mail.openjdk.java.net/pipermail/awt-dev/2014-May/007846.html
> JDK9 webrev: http://cr.openjdk.java.net/~pchelko/9/8043610/webrev/
>
> JDK9 changeset: 
> http://hg.openjdk.java.net/jdk9/client/jdk/rev/604abecf62c2
> JDK8 changeset: 
> http://hg.openjdk.java.net/jdk8u/jdk8u-dev/jdk/rev/b20c4785bb81
>
>
> Thank you in advance,
> Alexey.



From dmitriy.ermashov at oracle.com  Fri Aug 22 08:38:43 2014
From: dmitriy.ermashov at oracle.com (Dmitriy Ermashov)
Date: Fri, 22 Aug 2014 12:38:43 +0400
Subject: <Swing Dev> Review Request for 8055360: Move the rest part of AWT
 ShapedAndTranslucent tests to OpenJDK
Message-ID: <53F70193.7010100@oracle.com>

Hi Swing team,

Please review one more part of functional tests being moved to OpenJDK.
It is a swing part of AWT_ShapedAndTranslucent tests.
http://cr.openjdk.java.net/~dermashov/8055360/webrev.00/
(corresponding bug https://bugs.openjdk.java.net/browse/JDK-8055360)

Tests checks the correctness of displaying and resizing translucent and 
shaped windows (JFrame, JDialog, JWindow).

Tests were verified on the following platforms:
1. Ubuntu 14.04 x64
2. OEL 7 x64
3. Ubuntu 10.04 arm
4. Windows 7 x64
5. OS X 10.10 beta
6. Solaris 11 x64

The results were:
TranslucentJComboBox.java fails on OS X due to bug 8024627
SetShapeAndClickSwing.java fails on OS X due to bug 8013450
ShapedPerPixelTranslucentGradient.java fails on Linux and Solaris due to 
bug 7043845
PerPixelTranslucentGradient fails on Solaris due to 8032644

All other combinations of tests and platforms were successful.

Thanks,
Dima


From dalibor.topic at oracle.com  Fri Aug 22 09:28:43 2014
From: dalibor.topic at oracle.com (dalibor topic)
Date: Fri, 22 Aug 2014 11:28:43 +0200
Subject: <Swing Dev> [7u-dev] Request for approval for JDK-8043610:
 Sorting columns in JFileChooser fails with AppContext NPE
In-Reply-To: <53F4A41D.4020804@oracle.com>
References: <53F4A41D.4020804@oracle.com>
Message-ID: <53F70D4B.3030705@oracle.com>

Approved for jdk7u-dev.

cheers,
dalibor topic

On 20.08.2014 15:35, Alexey Ivanov wrote:
> Hello,
>
> Please approve the backport of the fix to jdk7u-dev.
>
> I replaced lambda expressions and method reference with anonymous classes:
>
>      webrev: http://cr.openjdk.java.net/~aivanov/8043610/jdk7/webrev.00/
>
>
> AWT and Swing teams,
>
> Could you please review the backport?
>
> JBS bug: https://bugs.openjdk.java.net/browse/JDK-8043610
> JDK9 review:
> http://mail.openjdk.java.net/pipermail/awt-dev/2014-May/007846.html
> JDK9 webrev: http://cr.openjdk.java.net/~pchelko/9/8043610/webrev/
>
> JDK9 changeset: http://hg.openjdk.java.net/jdk9/client/jdk/rev/604abecf62c2
> JDK8 changeset:
> http://hg.openjdk.java.net/jdk8u/jdk8u-dev/jdk/rev/b20c4785bb81
>
>
> Thank you in advance,
> Alexey.

-- 
<http://www.oracle.com> Dalibor Topic | Principal Product Manager
Phone: +494089091214 <tel:+494089091214> | Mobile: +491737185961
<tel:+491737185961>

ORACLE Deutschland B.V. & Co. KG | K?hneh?fe 5 | 22761 Hamburg

ORACLE Deutschland B.V. & Co. KG
Hauptverwaltung: Riesstr. 25, D-80992 M?nchen
Registergericht: Amtsgericht M?nchen, HRA 95603
Gesch?ftsf?hrer: J?rgen Kunz

Komplement?rin: ORACLE Deutschland Verwaltung B.V.
Hertogswetering 163/167, 3543 AS Utrecht, Niederlande
Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697
Gesch?ftsf?hrer: Alexander van der Ven, Astrid Kepper, Val Maher

<http://www.oracle.com/commitment> Oracle is committed to developing
practices and products that help protect the environment


From alexey.ivanov at oracle.com  Fri Aug 22 11:14:21 2014
From: alexey.ivanov at oracle.com (Alexey Ivanov)
Date: Fri, 22 Aug 2014 15:14:21 +0400
Subject: <Swing Dev> [7u-dev] Request for approval for JDK-8043610:
 Sorting columns in JFileChooser fails with AppContext NPE
In-Reply-To: <53F4AC4B.2080506@oracle.com>
References: <53F4A41D.4020804@oracle.com> <53F4A621.1070905@oracle.com>
	<53F4AC4B.2080506@oracle.com>
Message-ID: <53F7260D.4090403@oracle.com>

Se?n and Dalibor, thank you for approval.
Anthony and Alexander, thank you for review.

Regards,
Alexey.

On 20.08.2014 18:10, Se?n Coffey wrote:
> Approved.
>
> regards,
> Sean.
>
> On 20/08/14 14:44, Anthony Petrov wrote:
>> Looks fine. +1
>>
>> -- 
>> best regards,
>> Anthony
>>
>> On 8/20/2014 5:35 PM, Alexey Ivanov wrote:
>>> Hello,
>>>
>>> Please approve the backport of the fix to jdk7u-dev.
>>>
>>> I replaced lambda expressions and method reference with anonymous 
>>> classes:
>>>
>>>      webrev: 
>>> http://cr.openjdk.java.net/~aivanov/8043610/jdk7/webrev.00/
>>>
>>>
>>> AWT and Swing teams,
>>>
>>> Could you please review the backport?
>>>
>>> JBS bug: https://bugs.openjdk.java.net/browse/JDK-8043610
>>> JDK9 review:
>>> http://mail.openjdk.java.net/pipermail/awt-dev/2014-May/007846.html
>>> JDK9 webrev: http://cr.openjdk.java.net/~pchelko/9/8043610/webrev/
>>>
>>> JDK9 changeset: 
>>> http://hg.openjdk.java.net/jdk9/client/jdk/rev/604abecf62c2
>>> JDK8 changeset:
>>> http://hg.openjdk.java.net/jdk8u/jdk8u-dev/jdk/rev/b20c4785bb81
>>>
>>>
>>> Thank you in advance,
>>> Alexey.
>



From weijun.wang at oracle.com  Mon Aug 25 02:03:19 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Mon, 25 Aug 2014 10:03:19 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>
	<EB3B6783-938E-4130-A92F-0F289672A023@oracle.co! ! m>
	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>
	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>
	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>
Message-ID: <67921D59-5230-49F1-B526-5A39B75FF27F@oracle.com>

New webrevs updated

http://cr.openjdk.java.net/~weijun/8055723/core/webrev.00/

  Includes modules java.base and security-related modules and the jarsigner tool

http://cr.openjdk.java.net/~weijun/8055723/client/webrev.00

  Includes the java.desktop module

http://cr.openjdk.java.net/~weijun/8055723/extra/webrev.00

  Includes java.corba, java.management, java.naming, java.rmi, jdk.dev, jdk.jcmd, jdk.jconsole, jdk.jdi, jdk.jvmstat, /jdk.naming.dns, jdk.runtime, jdk.snmp, and a jpda demo file

Thanks
Max
 

From mike at vorburger.ch  Sat Aug 23 21:09:12 2014
From: mike at vorburger.ch (Michael Vorburger)
Date: Sat, 23 Aug 2014 23:09:12 +0200
Subject: <Swing Dev> JVM crash on Linux: program 'java' received an X Window
 System error RenderBadPicture when invoking
 UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel"); 
Message-ID: <CALiX4iZ3p8BRZje6O8mGrnt-xzqin1UkR-LAJhAsoX4i35nV5A@mail.gmail.com>

Hello OpenJDK Swing team (I am NOT subscribed to the
swing-dev at openjdk.java.net list; could you please reply-to-all to include
direct mail to me if responding?),

I have a reproducible JVM crash on Linux: program 'java' received an X
Window System error RenderBadPicture when invoking
UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel"), see
my https://github.com/vorburger/CrashTestDummy - are you guys interested in
checking this out?

Regards.
_______________________
Michael Vorburger
http://www.vorburger.ch
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140823/9accd079/attachment.html>

From Alan.Bateman at oracle.com  Mon Aug 25 15:19:24 2014
From: Alan.Bateman at oracle.com (Alan Bateman)
Date: Mon, 25 Aug 2014 16:19:24 +0100
Subject: <Swing Dev> Replace concat String to append in StringBuilder
 parameters
In-Reply-To: <67921D59-5230-49F1-B526-5A39B75FF27F@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>	<53EA137C.5020701@oracle.com>	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>	<53F36DF4.6000008@oracle.com>	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>	<EB3B6783-938E-4130-A92F-0F289672A023@oracle.co!
	!
	m>	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>
	<67921D59-5230-49F1-B526-5A39B75FF27F@orac! le.com>
Message-ID: <53FB53FC.5040605@oracle.com>

On 25/08/2014 03:03, Wang Weijun wrote:
> New webrevs updated
>
> http://cr.openjdk.java.net/~weijun/8055723/core/webrev.00/
>
>    Includes modules java.base and security-related modules and the jarsigner tool
>
> http://cr.openjdk.java.net/~weijun/8055723/client/webrev.00
>
>    Includes the java.desktop module
>
> http://cr.openjdk.java.net/~weijun/8055723/extra/webrev.00
Thanks for donning the sponsor hat, it's always a pain to have deal with 
changes that require splitting between jdk9/dev and jdk9/client. 
Hopefully in time that this business can be re-visited so that changes 
to client libraries can be pushed to jdk9/dev. For the webrev then I 
assume there isn't any need to split core and what you call "extra" as 
they will all go into jdk9/dev.

I saw a few comments on tabs and maybe this is what I see but some of 
the indentation looks a bit odd and inconsistent in a number of places. 
It seems to be mostly places where method invocation chaining is used 
and the statement goes into a second or third line. In a few places then 
the .append is aligned with the start of sb.append (see DHParameters and 
GSMParameters for example), in other places then the second/more lines 
are pushed in by 8.

You can probably drop 
src/demo/share/jpda/com/sun/tools/example/debug/gui/ContextManager.java 
from the list as there is a patch in review on serviceability-dev that 
will get this of this obsolete demo.

-Alan.


From weijun.wang at oracle.com  Tue Aug 26 03:28:09 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Tue, 26 Aug 2014 11:28:09 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <53FB53FC.5040605@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>	<53EA137C.5020701@oracle.com>	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>	<53F36DF4.6000008@oracle.com>	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>	<EB3B6783-938E-4130-A92F-0F289672A023@oracle.co!
	!
	m>	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>
	<67921D59-5230-49F1-B526-5A39B75FF27F@orac!
	le.com> <53FB53FC.5040605@oracle.com>
Message-ID: <90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>

New webrevs available at

  http://cr.openjdk.java.net/~weijun/8055723/client/webrev.01/
  http://cr.openjdk.java.net/~weijun/8055723/core/webrev.01/  

There are only 2 now. Everything non-client is in core.

Everyone, please do code review quickly because the patch touches too many files and any delay could mean re-merge.

*Ot?vio*: If there is only small change in feedback, tell me to update my own repo and you don't need to generate the big patch again.

I see you still include that demo file.

Thanks
Max




From xuelei.fan at oracle.com  Tue Aug 26 05:20:15 2014
From: xuelei.fan at oracle.com (Xuelei Fan)
Date: Tue, 26 Aug 2014 13:20:15 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
 parameters
In-Reply-To: <90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>	<53EA137C.5020701@oracle.com>	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>	<53F36DF4.6000008@oracle.com>	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>	<EB3B6783-938E-4130-A92F-0F289672A023@oracle.co!	!	m>	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>	<67921D59-5230-49F1-B526-5A39B75FF27F@orac!	le.com>
	<53FB53FC.5040605@oracle.com>
	<90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>
Message-ID: <53FC190F.7030204@oracle.com>

I was wondering, is it nice to address it in Java compiler to use string
builder for the string "+" operator?

Xuelei


On 8/26/2014 11:28 AM, Wang Weijun wrote:
> New webrevs available at
> 
>   http://cr.openjdk.java.net/~weijun/8055723/client/webrev.01/
>   http://cr.openjdk.java.net/~weijun/8055723/core/webrev.01/  
> 
> There are only 2 now. Everything non-client is in core.
> 
> Everyone, please do code review quickly because the patch touches too many files and any delay could mean re-merge.
> 
> *Ot?vio*: If there is only small change in feedback, tell me to update my own repo and you don't need to generate the big patch again.
> 
> I see you still include that demo file.
> 
> Thanks
> Max
> 
> 



From pavel.rappo at oracle.com  Tue Aug 26 08:41:25 2014
From: pavel.rappo at oracle.com (Pavel Rappo)
Date: Tue, 26 Aug 2014 09:41:25 +0100
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <53FC190F.7030204@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>	<53EA137C.5020701@oracle.com>	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>	<53F36DF4.6000008@oracle.com>	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>	<EB3B6783-938E-4130-A92F-0F289672A023@oracle.co!	!	m>	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>	<67921D59-5230-49F1-B526-5A39B75FF27F@orac!	le.com>
	<53FB53FC.5040605@oracle.com>
	<90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>
	<53FC190F.7030204@oracle.com>
Message-ID: <14C6AB07-3499-4535-A4CE-8F1838EA0971@oracle.com>

It's exactly the way it's been working since 1.6 I believe.

<source>

public class Optimization {

    public String concat(String... strings) {
        return "#: " + strings[0] + strings[2] + strings[3] + "...";
    }
}

<compiled into>

public class Optimization {
  public Optimization();
    Code:
       0: aload_0
       1: invokespecial #1                  // Method java/lang/Object."<init>":()V
       4: return

  public java.lang.String concat(java.lang.String...);
    Code:
       0: new           #2                  // class java/lang/StringBuilder
       3: dup
       4: invokespecial #3                  // Method java/lang/StringBuilder."<init>":()V
       7: ldc           #4                  // String #:
       9: invokevirtual #5                  // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
      12: aload_1
      13: iconst_0
      14: aaload
      15: invokevirtual #5                  // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
      18: aload_1
      19: iconst_2
      20: aaload
      21: invokevirtual #5                  // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
      24: aload_1
      25: iconst_3
      26: aaload
      27: invokevirtual #5                  // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
      30: ldc           #6                  // String ...
      32: invokevirtual #5                  // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
      35: invokevirtual #7                  // Method java/lang/StringBuilder.toString:()Ljava/lang/String;
      38: areturn
}

-Pavel

On 26 Aug 2014, at 06:20, Xuelei Fan <xuelei.fan at oracle.com> wrote:

> I was wondering, is it nice to address it in Java compiler to use string
> builder for the string "+" operator?
> 
> Xuelei
> 
> 
> On 8/26/2014 11:28 AM, Wang Weijun wrote:
>> New webrevs available at
>> 
>>  http://cr.openjdk.java.net/~weijun/8055723/client/webrev.01/
>>  http://cr.openjdk.java.net/~weijun/8055723/core/webrev.01/  
>> 
>> There are only 2 now. Everything non-client is in core.
>> 
>> Everyone, please do code review quickly because the patch touches too many files and any delay could mean re-merge.
>> 
>> *Ot?vio*: If there is only small change in feedback, tell me to update my own repo and you don't need to generate the big patch again.
>> 
>> I see you still include that demo file.
>> 
>> Thanks
>> Max
>> 
>> 
> 



From xuelei.fan at oracle.com  Tue Aug 26 09:11:29 2014
From: xuelei.fan at oracle.com (Xuelei Fan)
Date: Tue, 26 Aug 2014 17:11:29 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
 parameters
In-Reply-To: <14C6AB07-3499-4535-A4CE-8F1838EA0971@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>	<53EA137C.5020701@oracle.com>	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>	<53F36DF4.6000008@oracle.com>	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>	<EB3B6783-938E-4130-A92F-0F289672A023@oracle.co!	!	m>	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>	<67921D59-5230-49F1-B526-5A39B75FF27F@orac!	le.com>
	<53FB53FC.5040605@oracle.com>
	<90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>
	<53FC190F.7030204@oracle.com>
	<14C6AB07-3499-4535-A4CE-8F1838EA0971@oracle.com>
Message-ID: <53FC4F41.2000104@oracle.com>

Pavel, thanks for the checking and confirm.

Look back to the benchmark code:

private StringBuilder createBuilder(String... values) {
    StringBuilder text = new StringBuilder();
    text.append(values[0]).append(values[1])
    .append(values[2]).append(values[3])
    .append(values[4]).append(values[5]);
    return text;
}

private StringBuilder createBuilderWithConcat(String... values) {
    StringBuilder text = new StringBuilder();
    text.append(values[0] + values[1])
    .append(values[2] + values[3])
    .append(values[4]+ values[5]);
    return text;
}

Comparing to createBuilder, the code similar to (values[0] + values[1])
in createBuilderWithConcat may take additional memory and CPU cycles to
create new StringBuffer objects. As may be able to explain the benchmark
result.

Therefore, I think it might not be necessary to make this change
(replacing string "+" operator with StringBuilder append()).

Xuelei

On 8/26/2014 4:41 PM, Pavel Rappo wrote:
> It's exactly the way it's been working since 1.6 I believe.
> 
> <source>
> 
> public class Optimization {
> 
>     public String concat(String... strings) {
>         return "#: " + strings[0] + strings[2] + strings[3] + "...";
>     }
> }
> 
> <compiled into>
> 
> public class Optimization {
>   public Optimization();
>     Code:
>        0: aload_0
>        1: invokespecial #1                  // Method java/lang/Object."<init>":()V
>        4: return
> 
>   public java.lang.String concat(java.lang.String...);
>     Code:
>        0: new           #2                  // class java/lang/StringBuilder
>        3: dup
>        4: invokespecial #3                  // Method java/lang/StringBuilder."<init>":()V
>        7: ldc           #4                  // String #:
>        9: invokevirtual #5                  // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
>       12: aload_1
>       13: iconst_0
>       14: aaload
>       15: invokevirtual #5                  // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
>       18: aload_1
>       19: iconst_2
>       20: aaload
>       21: invokevirtual #5                  // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
>       24: aload_1
>       25: iconst_3
>       26: aaload
>       27: invokevirtual #5                  // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
>       30: ldc           #6                  // String ...
>       32: invokevirtual #5                  // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
>       35: invokevirtual #7                  // Method java/lang/StringBuilder.toString:()Ljava/lang/String;
>       38: areturn
> }
> 
> -Pavel
> 
> On 26 Aug 2014, at 06:20, Xuelei Fan <xuelei.fan at oracle.com> wrote:
> 
>> I was wondering, is it nice to address it in Java compiler to use string
>> builder for the string "+" operator?
>>
>> Xuelei
>>
>>
>> On 8/26/2014 11:28 AM, Wang Weijun wrote:
>>> New webrevs available at
>>>
>>>  http://cr.openjdk.java.net/~weijun/8055723/client/webrev.01/
>>>  http://cr.openjdk.java.net/~weijun/8055723/core/webrev.01/  
>>>
>>> There are only 2 now. Everything non-client is in core.
>>>
>>> Everyone, please do code review quickly because the patch touches too many files and any delay could mean re-merge.
>>>
>>> *Ot?vio*: If there is only small change in feedback, tell me to update my own repo and you don't need to generate the big patch again.
>>>
>>> I see you still include that demo file.
>>>
>>> Thanks
>>> Max
>>>
>>>
>>
> 



From alexandr.scherbatiy at oracle.com  Tue Aug 26 10:02:49 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Tue, 26 Aug 2014 14:02:49 +0400
Subject: <Swing Dev> [9] Review request for 8048110: Using tables in
 JTextPane leads to infinite loop in FlowLayout.layoutRow
In-Reply-To: <53F5B5FB.9070702@oracle.com>
References: <50d74d59-9ebb-4c8b-8e8f-1f4e17bf1074@default>
	<53F1B4FA.4080009@oracle.com> <53F5B5FB.9070702@oracle.com>
Message-ID: <53FC5B49.90801@oracle.com>


   - The fix sends an update event to all views followed by the changed 
place only if the first updated view is GlyphView.
     Should the GlyphViews be updated if the first view is not the 
GlyphView?

   - The javadoc for forwardUpdate() methods says: "If there were 
changes to the element this view is responsible for, that should be 
considered when forwarding (i.e. new child views should not get notified)."
     Does it mean that new views will be updated twice first in the 
FlowView.forwardUpdate()  method and second during initialization?

   Thanks,
   Alexandr.

On 8/21/2014 1:03 PM, dmitry markov wrote:
> Hello,
>
> Reminder. Could you review this, please?
>
> Thanks,
> Dmitry
> On 18/08/2014 12:10, dmitry markov wrote:
>> Hello Sergey,
>>
>> LogicalView.forwardUpdate() sends update event to all views followed 
>> by the changed place. This event will cause view to drop the cache 
>> and re-calculate its break points. This method was added under 
>> JDK-8024395 <https://bugs.openjdk.java.net/browse/JDK-8024395> and 
>> intended for the documents contained only text elements. The current 
>> implementation does not expect that non-text element, (e.g. a table) 
>> can be added to the document.
>> If the table is added to the document with flow layout, the 
>> invocation of LogicalView.forwardUpdate() will produce some negative 
>> visual effects (table will be displayed several times). In case of 
>> replacing the text by the table the situation much worse, since the 
>> FlowView will try to re-layout the removed text and hangs.
>>
>> We have to send the update events to all instances of GlyphView 
>> followed by changed place for proper text line breaks calculation, 
>> see JDK-8024395 <https://bugs.openjdk.java.net/browse/JDK-8024395>, 
>> JDK-8014863 <https://bugs.openjdk.java.net/browse/JDK-8014863>. 
>> That's why I added checks for GlyphView instance. I understand this 
>> might be not a good place, but only here we have information about 
>> all views in the document and can forward update to them, if any.
>> Please note another approach to solve the problems with line breaks 
>> calculation - re-calculate break spots any time when a view is laid 
>> out. As far as I know it is used in jdk6, but this solution is not 
>> suitable, since it causes serious performance problems in case of 
>> large documents.
>>
>> Also I have updated the fix. New version - 
>> http://cr.openjdk.java.net/~dmarkov/8048110/jdk9/webrev.01/
>> Now LogicalView.forwardUpdate() sends update only to GlyphView 
>> followed by the changed place. This resolves the problem when the 
>> table is located in the middle of the text line.
>>
>> Thanks,
>> Dmitry
>>
>> On 15/08/2014 12:56, Sergey Bylokhov wrote:
>>> Hello, Dmitry.
>>>>> The LogicalView.forwardUpdate() should send an update event to the views
>>>>> followed by the changed place, only when an instance of GlyphView has
>>>>> changed; otherwise it should invoke View.forwardUpdate() to handle the
>>>>> update properly.
>>> Can you share additional information about the fix. Why LogicalView should send an update if GlyphView was changed only. Because before the fix LocalView knows nothing about GlyphView.
>>>
>>> Thanks,
>>> Dmitry
>>
>



From alexandr.scherbatiy at oracle.com  Tue Aug 26 10:06:56 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Tue, 26 Aug 2014 14:06:56 +0400
Subject: <Swing Dev> [9] Review Request: 6329748 Invalid/old variable
 name - newModel in setModel method in JTable class
In-Reply-To: <53F20B2D.1080704@oracle.com>
References: <53F20B2D.1080704@oracle.com>
Message-ID: <53FC5C40.5060504@oracle.com>


   The fix look good to me.

   Thanks,
   Alexandr.

On 8/18/2014 6:18 PM, Sergey Bylokhov wrote:
> Hello.
> Please review the small fix for jdk 9.
> Bug description:
> Long long time ago all our JTable.set*model methods used newModel as a 
> parameter.
> Since then:
>  - setModel() parameterand at param tag were changed from newModel to 
> dataModel, but method description and @exception were not updated.
>  - setColumnModel parameter, @param and @exception tags werechanged 
> from newModel to columnModel, but method description was not updated.
>  - setSelectionModel was not updated at all.
>
> Plus in the fix I align description of all of these methods to the one 
> style.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-6329748
> Webrev can be found at: 
> http://cr.openjdk.java.net/~serb/6329748/webrev.00
>



From alexandr.scherbatiy at oracle.com  Tue Aug 26 10:31:57 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Tue, 26 Aug 2014 14:31:57 +0400
Subject: <Swing Dev> Review Request for 8055360: Move the rest part of
 AWT ShapedAndTranslucent tests to OpenJDK
In-Reply-To: <53F70193.7010100@oracle.com>
References: <53F70193.7010100@oracle.com>
Message-ID: <53FC621D.7090805@oracle.com>


   The fix looks good to me.

   Thanks,
   Alexandr.

On 8/22/2014 12:38 PM, Dmitriy Ermashov wrote:
> Hi Swing team,
>
> Please review one more part of functional tests being moved to OpenJDK.
> It is a swing part of AWT_ShapedAndTranslucent tests.
> http://cr.openjdk.java.net/~dermashov/8055360/webrev.00/
> (corresponding bug https://bugs.openjdk.java.net/browse/JDK-8055360)
>
> Tests checks the correctness of displaying and resizing translucent 
> and shaped windows (JFrame, JDialog, JWindow).
>
> Tests were verified on the following platforms:
> 1. Ubuntu 14.04 x64
> 2. OEL 7 x64
> 3. Ubuntu 10.04 arm
> 4. Windows 7 x64
> 5. OS X 10.10 beta
> 6. Solaris 11 x64
>
> The results were:
> TranslucentJComboBox.java fails on OS X due to bug 8024627
> SetShapeAndClickSwing.java fails on OS X due to bug 8013450
> ShapedPerPixelTranslucentGradient.java fails on Linux and Solaris due 
> to bug 7043845
> PerPixelTranslucentGradient fails on Solaris due to 8032644
>
> All other combinations of tests and platforms were successful.
>
> Thanks,
> Dima



From alexandr.scherbatiy at oracle.com  Tue Aug 26 10:49:01 2014
From: alexandr.scherbatiy at oracle.com (Alexander Scherbatiy)
Date: Tue, 26 Aug 2014 14:49:01 +0400
Subject: <Swing Dev> JVM crash on Linux: program 'java' received an X
 Window System error RenderBadPicture when invoking
 UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel"); 
In-Reply-To: <CALiX4iZ3p8BRZje6O8mGrnt-xzqin1UkR-LAJhAsoX4i35nV5A@mail.gmail.com>
References: <CALiX4iZ3p8BRZje6O8mGrnt-xzqin1UkR-LAJhAsoX4i35nV5A@mail.gmail.com>
Message-ID: <53FC661D.9080903@oracle.com>


   Hi Michael,

   Could you file a bug on it: http://bugreport.java.com/bugreport ?

  Thanks,
  Alexandr.


On 8/24/2014 1:09 AM, Michael Vorburger wrote:
> Hello OpenJDK Swing team (I am NOT subscribed to the 
> swing-dev at openjdk.java.net <mailto:swing-dev at openjdk.java.net> list; 
> could you please reply-to-all to include direct mail to me if 
> responding?),
>
> I have a reproducible JVM crash on Linux: program 'java' received an X 
> Window System error RenderBadPicture when invoking 
> UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel"), see 
> my https://github.com/vorburger/CrashTestDummy - are you guys 
> interested in checking this out?
>
> Regards.
> _______________________
> Michael Vorburger
> http://www.vorburger.ch



From andrej.golovnin at gmail.com  Tue Aug 26 11:12:03 2014
From: andrej.golovnin at gmail.com (Andrej Golovnin)
Date: Tue, 26 Aug 2014 13:12:03 +0200
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>
	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>
	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>
	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>
	<53FB53FC.5040605@oracle.com>
	<90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>
Message-ID: <CAM6ZMz-QD9yoMfWqDLwXB+w-LJ+K9b9Os_J3i+qqv20kSNFyaA@mail.gmail.com>

Hi all,

src/java.base/share/classes/com/sun/crypto/provider/DHPublicKey.java:
269                 .append(LINE_SEP + "g:" + LINE_SEP)

should be changed to:
269                 .append(LINE_SEP).append( "g:").append(LINE_SEP)


src/java.base/share/classes/sun/security/x509/PolicyInformation.java:
 260     public String toString() {
 261         StringBuilder sb = new StringBuilder("  [" +
policyIdentifier.toString());
 262         sb.append(policyQualifiers).append("  ]\n");
 263         return sb.toString();
 264     }

should be changed either to:
 260     public String toString() {
 261         StringBuilder sb = new StringBuilder("  [");
 262         sb.append(policyIdentifier);
 263         sb.append(policyQualifiers).append("  ]\n");
 264         return sb.toString();
 265     }

or to:
 260     public String toString() {
 261         return "  [" + policyIdentifier + policyQualifiers + "  ]\n";
 262     }


src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java:
 316                             sb.append("Extension unknown: " + "DER
encoded OCTET string =\n")

should be changed to:
 316                             sb.append("Extension unknown: DER encoded
OCTET string =\n")

same problems are in
src/java.base/share/classes/sun/security/x509/X509CRLImpl.java in the line
576
src/java.base/share/classes/sun/security/x509/X509CertInfo.java in the line
332

Best regards,
Andrej Golovnin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140826/33ad51a9/attachment.html>

From weijun.wang at oracle.com  Tue Aug 26 13:33:07 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Tue, 26 Aug 2014 21:33:07 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>	<53EA137C.5020701@oracle.com>	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>	<53F36DF4.6000008@oracle.com>	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>	<EB3B6783-938E-4130-A92F-0F289672A023@oracle.co!
	!
	m>	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>
	<67921D59-5230-49F1-B526-5A39B75FF27F@orac!
	! le.com> <53FB53FC.5040605@oracle.com>
	<90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>
Message-ID: <E8BBE494-8050-480E-A887-441A1BE19C7A@oracle.com>

I see no problem from the core part of the webrev.

However, I am not sure how you find all the occurrences of "+" in StringBuilder, but I just run the following command in jdk/src

  find . -type f -name *.java -print | xargs grep -n StringBuilder | perl -ne 'print if /new StringBuilder\([^\)]*\+/'
  find . -type f -name *.java -print | xargs grep -n append | perl -ne 'print if /append\([^\)]*\+/'

and there are still many results.

Some are false alarms like

  buf.append(" + ");
  result.append(patt.charAt(i + 1));

but I still see

  sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
  StringBuilder sb = new StringBuilder("\"" + ti.getThreadName() + "\"" +
  tagBuffer.append("<tr bgcolor=\""+ color[selColorIndex] + "\">");
  ...

Thanks
Max


On Aug 26, 2014, at 11:28, Wang Weijun <weijun.wang at oracle.com> wrote:

> New webrevs available at
> 
>  http://cr.openjdk.java.net/~weijun/8055723/client/webrev.01/
>  http://cr.openjdk.java.net/~weijun/8055723/core/webrev.01/  
> 
> There are only 2 now. Everything non-client is in core.
> 
> Everyone, please do code review quickly because the patch touches too many files and any delay could mean re-merge.
> 
> *Ot?vio*: If there is only small change in feedback, tell me to update my own repo and you don't need to generate the big patch again.
> 
> I see you still include that demo file.
> 
> Thanks
> Max
> 
> 



From mike at vorburger.ch  Tue Aug 26 16:09:11 2014
From: mike at vorburger.ch (Michael Vorburger)
Date: Tue, 26 Aug 2014 18:09:11 +0200
Subject: <Swing Dev> JVM crash on Linux: program 'java' received an X
 Window System error RenderBadPicture when invoking
 UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel"); 
In-Reply-To: <53FC661D.9080903@oracle.com>
References: <CALiX4iZ3p8BRZje6O8mGrnt-xzqin1UkR-LAJhAsoX4i35nV5A@mail.gmail.com>
	<53FC661D.9080903@oracle.com>
Message-ID: <CALiX4ia1M5FPW0-MgMAmsgGVZAn_JpYk5mEB8akxWSnaOUQDNg@mail.gmail.com>

On Tue, Aug 26, 2014 at 12:49 PM, Alexander Scherbatiy <
alexandr.scherbatiy at oracle.com> wrote:

  Could you file a bug on it: http://bugreport.java.com/bugreport ?


I did (48h ago), and so far only got an auto-response saying "We are
evaluating this report and have stored this with an Review ID: JI-9014491."
- can you expedite / take it forward internally using this ID?

PS: I've also blogged a little write-up about it on
http://blog2.vorburger.ch/2014/08/java-8-swing-related-jvm-crash-on-linux.html
..
_______________________
Michael Vorburger
http://www.vorburger.ch


On Tue, Aug 26, 2014 at 12:49 PM, Alexander Scherbatiy <
alexandr.scherbatiy at oracle.com> wrote:

>
>   Hi Michael,
>
>   Could you file a bug on it: http://bugreport.java.com/bugreport ?
>
>  Thanks,
>  Alexandr.
>
>
> On 8/24/2014 1:09 AM, Michael Vorburger wrote:
>
>> Hello OpenJDK Swing team (I am NOT subscribed to the
>> swing-dev at openjdk.java.net <mailto:swing-dev at openjdk.java.net> list;
>> could you please reply-to-all to include direct mail to me if responding?),
>>
>> I have a reproducible JVM crash on Linux: program 'java' received an X
>> Window System error RenderBadPicture when invoking
>> UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel"),
>> see my https://github.com/vorburger/CrashTestDummy - are you guys
>> interested in checking this out?
>>
>> Regards.
>> _______________________
>> Michael Vorburger
>> http://www.vorburger.ch
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140826/34339c97/attachment.html>

From weijun.wang at oracle.com  Wed Aug 27 02:07:56 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Wed, 27 Aug 2014 10:07:56 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <CAM6ZMz-QD9yoMfWqDLwXB+w-LJ+K9b9Os_J3i+qqv20kSNFyaA@mail.gmail.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>
	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>
	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>
	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>
	<53FB53FC.5040605@oracle.com>
	<90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com> <CAM6ZMz-QD9yoMf!
	WqDLwXB+w-LJ+K9b9Os_J3i+qqv20kSNFyaA@mail.gmail.com>
Message-ID: <BC3709D7-4BCD-445C-945A-49AD081969AC@oracle.com>

Webrev updated again, this time include more changes.

  http://cr.openjdk.java.net/~weijun/8055723/client/webrev.02/
  http://cr.openjdk.java.net/~weijun/8055723/core/webrev.02/

The change to a demo file is removed because that file itself is already removed.

*Ot?vio*: I believe Andrej's following suggestion is worth looking at.

Thanks
Max

On Aug 26, 2014, at 19:12, Andrej Golovnin <andrej.golovnin at gmail.com> wrote:

> 
> src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java:
>  316                             sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
> 
> should be changed to:
>  316                             sb.append("Extension unknown: DER encoded OCTET string =\n")
> 
> same problems are in 
> src/java.base/share/classes/sun/security/x509/X509CRLImpl.java in the line 576
> src/java.base/share/classes/sun/security/x509/X509CertInfo.java in the line 332
> 
> Best regards,
> Andrej Golovnin



From weijun.wang at oracle.com  Wed Aug 27 03:29:51 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Wed, 27 Aug 2014 11:29:51 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <BC3709D7-4BCD-445C-945A-49AD081969AC@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>
	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>
	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>
	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>
	<53FB53FC.5040605@oracle.com>
	<90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com> <CAM6ZMz-QD9yoMf!
	! WqDLwXB+w-LJ+K9b9Os_J3i+qqv20kSNFyaA@mail.gmail.com>
	<BC3709D7-4BCD-445C-945A-49AD081969AC@oracle.com>
Message-ID: <B38E9D6C-38F6-4074-89EF-31F1FED05C46@oracle.com>

I found an error:

diff --git a/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/Misc.java b/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/Misc.java
--- a/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/Misc.java
+++ b/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/Misc.java
@@ -97,11 +97,11 @@
             } else if (ch == '&') {
                 sb.append("&amp;");
             } else if (ch < ' ') {
-                sb.append("&#" + Integer.toString(ch) + ";");
+                sb.append("&#").append((int)ch).append(';');
             } else {
                 int c = (ch & 0xFFFF);
                 if (c > 127) {
-                    sb.append("&#" + Integer.toString(c) + ";");
+                    sb.append("&#").append((int)c).append(';');
                 } else {
                     sb.append(ch);
                 }

In the 2nd change, it should be "append(c)" instead of "append((int)c)". Here c is already an integer and this redundant cast will be treated as an error when -Werror specified.

--Max

On Aug 27, 2014, at 10:07, Wang Weijun <weijun.wang at oracle.com> wrote:

> Webrev updated again, this time include more changes.
> 
>  http://cr.openjdk.java.net/~weijun/8055723/client/webrev.02/
>  http://cr.openjdk.java.net/~weijun/8055723/core/webrev.02/
> 
> The change to a demo file is removed because that file itself is already removed.
> 
> *Ot?vio*: I believe Andrej's following suggestion is worth looking at.
> 
> Thanks
> Max
> 
> On Aug 26, 2014, at 19:12, Andrej Golovnin <andrej.golovnin at gmail.com> wrote:
> 
>> 
>> src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java:
>> 316                             sb.append("Extension unknown: " + "DER encoded OCTET string =\n")
>> 
>> should be changed to:
>> 316                             sb.append("Extension unknown: DER encoded OCTET string =\n")
>> 
>> same problems are in 
>> src/java.base/share/classes/sun/security/x509/X509CRLImpl.java in the line 576
>> src/java.base/share/classes/sun/security/x509/X509CertInfo.java in the line 332
>> 
>> Best regards,
>> Andrej Golovnin
> 



From dmitry.markov at oracle.com  Wed Aug 27 10:44:22 2014
From: dmitry.markov at oracle.com (dmitry markov)
Date: Wed, 27 Aug 2014 14:44:22 +0400
Subject: <Swing Dev> [9] Review request for 8048110: Using tables in
 JTextPane leads to infinite loop in FlowLayout.layoutRow
In-Reply-To: <53FC5B49.90801@oracle.com>
References: <50d74d59-9ebb-4c8b-8e8f-1f4e17bf1074@default>
	<53F1B4FA.4080009@oracle.com> <53F5B5FB.9070702@oracle.com>
	<53FC5B49.90801@oracle.com>
Message-ID: <53FDB686.1070006@oracle.com>

Hello Alexandr,

Thank you for the review. I have updated the fix according to your 
comments. Please find new version here - 
http://cr.openjdk.java.net/~dmarkov/8048110/jdk9/webrev.02/
Now FlowView.forwardUpdate() invokes super.forwardUpdate() to update the 
view responsible for the changed element and then sends update event to 
the GlyphViews followed by the changed place. It updates the GlyphViews 
regardless the type of the first view. Also new views are not updated 
twice anymore.

Thanks,
Dmitry
On 26/08/2014 14:02, Alexander Scherbatiy wrote:
>
>   - The fix sends an update event to all views followed by the changed 
> place only if the first updated view is GlyphView.
>     Should the GlyphViews be updated if the first view is not the 
> GlyphView?
>
>   - The javadoc for forwardUpdate() methods says: "If there were 
> changes to the element this view is responsible for, that should be 
> considered when forwarding (i.e. new child views should not get 
> notified)."
>     Does it mean that new views will be updated twice first in the 
> FlowView.forwardUpdate()  method and second during initialization?
>
>   Thanks,
>   Alexandr.
>
> On 8/21/2014 1:03 PM, dmitry markov wrote:
>> Hello,
>>
>> Reminder. Could you review this, please?
>>
>> Thanks,
>> Dmitry
>> On 18/08/2014 12:10, dmitry markov wrote:
>>> Hello Sergey,
>>>
>>> LogicalView.forwardUpdate() sends update event to all views followed 
>>> by the changed place. This event will cause view to drop the cache 
>>> and re-calculate its break points. This method was added under 
>>> JDK-8024395 <https://bugs.openjdk.java.net/browse/JDK-8024395> and 
>>> intended for the documents contained only text elements. The current 
>>> implementation does not expect that non-text element, (e.g. a table) 
>>> can be added to the document.
>>> If the table is added to the document with flow layout, the 
>>> invocation of LogicalView.forwardUpdate() will produce some negative 
>>> visual effects (table will be displayed several times). In case of 
>>> replacing the text by the table the situation much worse, since the 
>>> FlowView will try to re-layout the removed text and hangs.
>>>
>>> We have to send the update events to all instances of GlyphView 
>>> followed by changed place for proper text line breaks calculation, 
>>> see JDK-8024395 <https://bugs.openjdk.java.net/browse/JDK-8024395>, 
>>> JDK-8014863 <https://bugs.openjdk.java.net/browse/JDK-8014863>. 
>>> That's why I added checks for GlyphView instance. I understand this 
>>> might be not a good place, but only here we have information about 
>>> all views in the document and can forward update to them, if any.
>>> Please note another approach to solve the problems with line breaks 
>>> calculation - re-calculate break spots any time when a view is laid 
>>> out. As far as I know it is used in jdk6, but this solution is not 
>>> suitable, since it causes serious performance problems in case of 
>>> large documents.
>>>
>>> Also I have updated the fix. New version - 
>>> http://cr.openjdk.java.net/~dmarkov/8048110/jdk9/webrev.01/
>>> Now LogicalView.forwardUpdate() sends update only to GlyphView 
>>> followed by the changed place. This resolves the problem when the 
>>> table is located in the middle of the text line.
>>>
>>> Thanks,
>>> Dmitry
>>>
>>> On 15/08/2014 12:56, Sergey Bylokhov wrote:
>>>> Hello, Dmitry.
>>>>>> The LogicalView.forwardUpdate() should send an update event to 
>>>>>> the views
>>>>>> followed by the changed place, only when an instance of GlyphView 
>>>>>> has
>>>>>> changed; otherwise it should invoke View.forwardUpdate() to 
>>>>>> handle the
>>>>>> update properly.
>>>> Can you share additional information about the fix. Why LogicalView 
>>>> should send an update if GlyphView was changed only. Because before 
>>>> the fix LocalView knows nothing about GlyphView.
>>>>
>>>> Thanks,
>>>> Dmitry
>>>
>>
>



From weijun.wang at oracle.com  Wed Aug 27 14:13:43 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Wed, 27 Aug 2014 22:13:43 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <BC3709D7-4BCD-445C-945A-49AD081969AC@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<141CEE3F-4343-4767-A43C-5E7CF1A9F7A7@oracle.com>
	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>
	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>
	<53EA137C.5020701@oracle.com>
	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>
	<53F36DF4.6000008@oracle.com>
	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>
	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>
	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>
	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>
	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>
	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>
	<53FB53FC.5040605@oracle.com>
	<90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com> <CAM6ZMz-QD9yoMf!
	! WqDLwXB+w-LJ+K9b9Os_J3i+qqv20kSNFyaA@mail.gmail.com>
	<BC3709D7-4BCD-445C-945A-49AD081969AC@oracle.com>
Message-ID: <FBE53FA5-CEDD-46B6-B5F8-C0235ACFB5F7@oracle.com>


On Aug 27, 2014, at 10:07, Wang Weijun <weijun.wang at oracle.com> wrote:

> Webrev updated again, this time include more changes.
> 
>  http://cr.openjdk.java.net/~weijun/8055723/client/webrev.02/
>  http://cr.openjdk.java.net/~weijun/8055723/core/webrev.02/

The core part is updated again at

  http://cr.openjdk.java.net/~weijun/8055723/core/webrev.03/

including a fix s/(int)c/c/ in com/sun/tools/hat/internal/util/Misc.java and literal string merge in X509CRLEntryImpl.java, X509CRLImpl.java, and X509CertInfo.java.

No change for the client part.

Thanks
Max



From neugens at redhat.com  Wed Aug 27 15:56:56 2014
From: neugens at redhat.com (Mario Torre)
Date: Wed, 27 Aug 2014 17:56:56 +0200
Subject: <Swing Dev> Possible new project: OpenJDK LaF
Message-ID: <1409155016.25913.6.camel@nirvana.localdomain>

Hi all,

First of all, sorry for cross posting... I would like to kindly ask to
direct all the replies to this thread to the "discuss" alias if
possible.

Is a bit of time I'm playing with the idea of implementing a proper GTK3
look and feel for OpenJDK, something to make the jdk look a bit more
modern and also take it as an opportunity to solve some of the issues
the GTK2 laf has, including some related bugs like this:

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=729

I mentored a Summer of Code project last year where we produced a more
or less working and complete implementation. It was a student project
and the efforts to make it well abstracted and tested are really as
close as making a new implementation, however it was great to show that
we could have a basic and functional implementation in less than a month
of work, the new GTK3 library looks way nicer!

At the same time, since Swing will be [very] gradually replaced by
JavaFX, I think it would be awesome to have a JavaFX based look and
feel, something I started to play with last year as well but then put on
hold because of tons of other things to do:

https://neugens.wordpress.com/2013/07/21/javafx-look-and-feel-for-swing/

Recently I was convinced though that we should move forward with the
Java laf: Swing has still lots to say, and JavaFX is not yet as
integrated with OpenJDK as it should be (especially in Linux
distribution, although is more popular within the OSX and Windows
communities), but before I move forward (and get to propose a JEP for
this) I would like some early feedback and gather some ideas/potential
interest :)

Another possible implementation would be based on QT, which is even
cross platform by itself.

So to recap, what are your feelings about an official OpenJDK look and
feel collection?

Cheers,
Mario




From weijun.wang at oracle.com  Wed Aug 27 23:15:57 2014
From: weijun.wang at oracle.com (Wang Weijun)
Date: Thu, 28 Aug 2014 07:15:57 +0800
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <53FE1F25.6000409@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>	<53EA137C.5020701@oracle.com>	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>	<53F36DF4.6000008@oracle.com>	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>	<53FB53FC.5040605@oracle.com>	<90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>
	<CAM6ZMz-QD9yoMf!	!
	WqDLwXB+w-LJ+K9b9Os_J3i+qqv20kSNFyaA@mail.gmail.com>	<BC3709D7-4BCD-445C-945A-49AD081969AC@oracle.com>
	<FBE53FA5-CEDD-46B6-B5F8-C0235ACFB5F7@oracle.com>
	<53FE1F25.6000409@oracle.com>
Message-ID: <061E7188-4F9F-490F-8261-D62D0C4E6C05@oracle.com>

OK, I'll remember that. So you will include the StringBuilder changes into your fix?

--Max

On Aug 28, 2014, at 2:10, Ivan Gerasimov <ivan.gerasimov at oracle.com> wrote:

> Hi Max!
> 
>> The core part is updated again at
>> 
>>   http://cr.openjdk.java.net/~weijun/8055723/core/webrev.03/
> 
> Can you please revert changes to src/java.base/share/classes/sun/net/www/MimeEntry.java, as they're conflicting with the fix for JDK-8054714?
> 
> Apologizing for adding you more work.
> 
> Sincerely yours,
> Ivan
> 



From alexey.ivanov at oracle.com  Thu Aug 28 07:29:28 2014
From: alexey.ivanov at oracle.com (Alexey Ivanov)
Date: Thu, 28 Aug 2014 11:29:28 +0400
Subject: <Swing Dev> [7u-dev] Request for Approval and Review: 8056156:
 [TEST_BUG] Test javax/swing/JFileChooser/8046391/bug8046391.java fails in
 Windows
Message-ID: <53FEDA58.4030105@oracle.com>

Hello,

Could you please approve the fix of the test in jdk7u-dev?

Could you please review the fix?

   webrev: http://cr.openjdk.java.net/~aivanov/8056156/jdk7/webrev.00/
   JBS: https://bugs.openjdk.java.net/browse/JDK-8056156

Description:
The test fails to compile under jdk7 because of lambda expression.

The fix:
Convert lambda expression to anonymous class.


Thank you in advance,
Alexey.


From anthony.petrov at oracle.com  Thu Aug 28 07:30:53 2014
From: anthony.petrov at oracle.com (Anthony Petrov)
Date: Thu, 28 Aug 2014 11:30:53 +0400
Subject: <Swing Dev> [7u-dev] Request for Approval and Review: 8056156:
 [TEST_BUG] Test javax/swing/JFileChooser/8046391/bug8046391.java fails in
 Windows
In-Reply-To: <53FEDA58.4030105@oracle.com>
References: <53FEDA58.4030105@oracle.com>
Message-ID: <53FEDAAD.9060104@oracle.com>

Hi Alexey,

The fix looks fine.

--
best regards,
Anthony

On 8/28/2014 11:29 AM, Alexey Ivanov wrote:
> Hello,
>
> Could you please approve the fix of the test in jdk7u-dev?
>
> Could you please review the fix?
>
>    webrev: http://cr.openjdk.java.net/~aivanov/8056156/jdk7/webrev.00/
>    JBS: https://bugs.openjdk.java.net/browse/JDK-8056156
>
> Description:
> The test fails to compile under jdk7 because of lambda expression.
>
> The fix:
> Convert lambda expression to anonymous class.
>
>
> Thank you in advance,
> Alexey.


From sean.coffey at oracle.com  Thu Aug 28 08:30:16 2014
From: sean.coffey at oracle.com (=?UTF-8?B?U2XDoW4gQ29mZmV5?=)
Date: Thu, 28 Aug 2014 09:30:16 +0100
Subject: <Swing Dev> <AWT Dev> [7u-dev] Request for Approval and Review:
 8056156: [TEST_BUG] Test javax/swing/JFileChooser/8046391/bug8046391.java
 fails in Windows
In-Reply-To: <53FEDAAD.9060104@oracle.com>
References: <53FEDA58.4030105@oracle.com> <53FEDAAD.9060104@oracle.com>
Message-ID: <53FEE898.2070609@oracle.com>

Approved.

regards,
Sean.

On 28/08/2014 08:30, Anthony Petrov wrote:
> Hi Alexey,
>
> The fix looks fine.
>
> -- 
> best regards,
> Anthony
>
> On 8/28/2014 11:29 AM, Alexey Ivanov wrote:
>> Hello,
>>
>> Could you please approve the fix of the test in jdk7u-dev?
>>
>> Could you please review the fix?
>>
>>    webrev: http://cr.openjdk.java.net/~aivanov/8056156/jdk7/webrev.00/
>>    JBS: https://bugs.openjdk.java.net/browse/JDK-8056156
>>
>> Description:
>> The test fails to compile under jdk7 because of lambda expression.
>>
>> The fix:
>> Convert lambda expression to anonymous class.
>>
>>
>> Thank you in advance,
>> Alexey.



From martijnverburg at gmail.com  Wed Aug 27 16:03:42 2014
From: martijnverburg at gmail.com (Martijn Verburg)
Date: Wed, 27 Aug 2014 17:03:42 +0100
Subject: <Swing Dev> Possible new project: OpenJDK LaF
In-Reply-To: <1409155016.25913.6.camel@nirvana.localdomain>
References: <1409155016.25913.6.camel@nirvana.localdomain>
Message-ID: <CAP7YuAT9k04+0mNbk96R8=_jT_L+kuO+n9oSm8H3sKCauGhmwQ@mail.gmail.com>

I think a move to GTK 3 would eliminate a class of java/Linux desktop
issues we run across today. My concern would be the long term maintenance
of this piece...

On Wednesday, 27 August 2014, Mario Torre <neugens at redhat.com> wrote:

> Hi all,
>
> First of all, sorry for cross posting... I would like to kindly ask to
> direct all the replies to this thread to the "discuss" alias if
> possible.
>
> Is a bit of time I'm playing with the idea of implementing a proper GTK3
> look and feel for OpenJDK, something to make the jdk look a bit more
> modern and also take it as an opportunity to solve some of the issues
> the GTK2 laf has, including some related bugs like this:
>
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=729
>
> I mentored a Summer of Code project last year where we produced a more
> or less working and complete implementation. It was a student project
> and the efforts to make it well abstracted and tested are really as
> close as making a new implementation, however it was great to show that
> we could have a basic and functional implementation in less than a month
> of work, the new GTK3 library looks way nicer!
>
> At the same time, since Swing will be [very] gradually replaced by
> JavaFX, I think it would be awesome to have a JavaFX based look and
> feel, something I started to play with last year as well but then put on
> hold because of tons of other things to do:
>
> https://neugens.wordpress.com/2013/07/21/javafx-look-and-feel-for-swing/
>
> Recently I was convinced though that we should move forward with the
> Java laf: Swing has still lots to say, and JavaFX is not yet as
> integrated with OpenJDK as it should be (especially in Linux
> distribution, although is more popular within the OSX and Windows
> communities), but before I move forward (and get to propose a JEP for
> this) I would like some early feedback and gather some ideas/potential
> interest :)
>
> Another possible implementation would be based on QT, which is even
> cross platform by itself.
>
> So to recap, what are your feelings about an official OpenJDK look and
> feel collection?
>
> Cheers,
> Mario
>
>
>

-- 
Cheers,
Martijn
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140827/d92762d6/attachment.html>

From ivan.gerasimov at oracle.com  Wed Aug 27 18:10:45 2014
From: ivan.gerasimov at oracle.com (Ivan Gerasimov)
Date: Wed, 27 Aug 2014 22:10:45 +0400
Subject: <Swing Dev> Replace concat String to append in StringBuilder
 parameters
In-Reply-To: <FBE53FA5-CEDD-46B6-B5F8-C0235ACFB5F7@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>	<CAPc8kR231-1AuG3q_1Dun20Or-94YLUbtcs=Ky37dz3twrasog@mail.gmail.com>	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>	<53EA137C.5020701@oracle.com>	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>	<53F36DF4.6000008@oracle.com>	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>	<53FB53FC.5040605@oracle.com>	<90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>
	<CAM6ZMz-QD9yoMf!	!
	WqDLwXB+w-LJ+K9b9Os_J3i+qqv20kSNFyaA@mail.gmail.com>	<BC3709D7-4BCD-445C-945A-49AD081969AC@oracle.com>
	<FBE53FA5-CEDD-46B6-B5F8-C0235ACFB5F7@oracle.com>
Message-ID: <53FE1F25.6000409@oracle.com>

Hi Max!

> The core part is updated again at
>
>    http://cr.openjdk.java.net/~weijun/8055723/core/webrev.03/

Can you please revert changes to 
src/java.base/share/classes/sun/net/www/MimeEntry.java, as they're 
conflicting with the fix for JDK-8054714?

Apologizing for adding you more work.

Sincerely yours,
Ivan



From ivan.gerasimov at oracle.com  Wed Aug 27 23:49:17 2014
From: ivan.gerasimov at oracle.com (Ivan Gerasimov)
Date: Thu, 28 Aug 2014 03:49:17 +0400
Subject: <Swing Dev> Replace concat String to append in StringBuilder
 parameters
In-Reply-To: <061E7188-4F9F-490F-8261-D62D0C4E6C05@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>	<CAM6ZMz_xPJ+xWp=Evemd_d-6fHWq0K4uhj=jRWEKpcUve6SEUA@mail.gmail.com>	<53EA137C.5020701@oracle.com>	<CAPc8kR2qU_4X79dMYtHGt8vggmGJPCQeOisGNOJ7ea_X0cpLiA@mail.gmail.com>	<53F36DF4.6000008@oracle.com>	<CAPc8kR0Ke66VSh3VrqhWhahHQci2BveTMLNHvoyUnOm24L91-Q@mail.gmail.com>	<8ACDFE32-99C1-44A4-941D-47D3681EBA6A@oracle.com>	<CAPc8kR0GxxcX0-NsP5err638WBvRBOmSJPFuz1jceOmbnP+YGQ@mail.gmail.com>	<CAM6ZMz-e-ZDC_pg=jFDuOnS=01RuMDj_WLvTjUqLv9kmEJMPLQ@mail.gmail.com>	<739FC8D7-A438-485D-99D0-BA88EF20CA36@oracle.com>	<4FEECA8F-2B3A-42DE-9778-0119E644596D@oracle.com>	<53FB53FC.5040605@oracle.com>	<90DD3089-0347-4010-ADDC-686EF65FE48A@oracle.com>
	<CAM6ZMz-QD9yoMf!	!
	WqDLwXB+w-LJ+K9b9Os_J3i+qqv20kSNFyaA@mail.gmail.com>	<BC3709D7-4BCD-445C-945A-49AD081969AC@oracle.com>
	<FBE53FA5-CEDD-46B6-B5F8-C0235ACFB5F7@oracle.com>
	<53FE1F25.6000409@oracle.com>
	<061E7188-4F9F-490F-8261-D62D0C4E6C05@oracle.com>
Message-ID: <53FE6E7D.9030007@oracle.com>


On 28.08.2014 3:15, Wang Weijun wrote:
> OK, I'll remember that.
Thanks.

>   So you will include the StringBuilder changes into your fix?
No. I reimplemented MimeEntry.toProperty() with StringJoiner:
http://hg.openjdk.java.net/jdk9/dev/jdk/diff/8be081fb8db1/src/java.base/share/classes/sun/net/www/MimeEntry.java

Sincerely yours,
Ivan



From neugens at redhat.com  Thu Aug 28 10:04:46 2014
From: neugens at redhat.com (Mario Torre)
Date: Thu, 28 Aug 2014 12:04:46 +0200
Subject: <Swing Dev> Possible new project: OpenJDK LaF
In-Reply-To: <CAP7YuAT9k04+0mNbk96R8=_jT_L+kuO+n9oSm8H3sKCauGhmwQ@mail.gmail.com>
References: <1409155016.25913.6.camel@nirvana.localdomain>
	<CAP7YuAT9k04+0mNbk96R8=_jT_L+kuO+n9oSm8H3sKCauGhmwQ@mail.gmail.com>
Message-ID: <1409220286.25913.8.camel@nirvana.localdomain>

On Wed, 2014-08-27 at 17:03 +0100, Martijn Verburg wrote:
> I think a move to GTK 3 would eliminate a class of java/Linux desktop
> issues we run across today. My concern would be the long term maintenance
> of this piece...

Yeah, long term maintenance will surely be some overhead, like anything
that is added to the jdk.

The way I would target the development is to try to respect the common
denominator that works in the most important Linux distribution in their
long term support releases (Ubuntu LTS, RHEL 7 and derivatives, etc...).

Those distributions have very long term support so it should not be a
big problem with moving gtk version. For other variants, where gtk may
be more of a moving target, we need to count on users of those system to
help out, and we need to talk with gtk maintainers to ensure there's a
compatible set of features we need. Eclipse and Mozilla have the same
problem and from time to time it comes back to byte them, but that's the
way it is unfortunately.

I think we should also ensure that the look and feel can be swapped out
without harm, for example, avoiding that if the Gnome team ends up
rewriting things for the fun of it again, and gtk4 comes out, we can
just deploy the gtk3 version of the laf, together with the gtk2 and with
whatever the future gives us without it interfere (that is, if is not
used, it's like dead code, no classes loaded, no code touched at
runtime, nothing).

That basically means a very self contained look and feel, which is great
because it could be eventually used even on older JDK without troubles
as a plugin. Also, I don't thing I would like to make this the default
theme (which will be forever Metal) and not even the default native
theme, but having some way to configure a system wide default would be
neat (I think there's already some flags to drive the selection of the
default native theme, never really tried out how this works though). 

Cheers,
Mario

> On Wednesday, 27 August 2014, Mario Torre <neugens at redhat.com> wrote:
> 
> > Hi all,
> >
> > First of all, sorry for cross posting... I would like to kindly ask to
> > direct all the replies to this thread to the "discuss" alias if
> > possible.
> >
> > Is a bit of time I'm playing with the idea of implementing a proper GTK3
> > look and feel for OpenJDK, something to make the jdk look a bit more
> > modern and also take it as an opportunity to solve some of the issues
> > the GTK2 laf has, including some related bugs like this:
> >
> > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=729
> >
> > I mentored a Summer of Code project last year where we produced a more
> > or less working and complete implementation. It was a student project
> > and the efforts to make it well abstracted and tested are really as
> > close as making a new implementation, however it was great to show that
> > we could have a basic and functional implementation in less than a month
> > of work, the new GTK3 library looks way nicer!
> >
> > At the same time, since Swing will be [very] gradually replaced by
> > JavaFX, I think it would be awesome to have a JavaFX based look and
> > feel, something I started to play with last year as well but then put on
> > hold because of tons of other things to do:
> >
> > https://neugens.wordpress.com/2013/07/21/javafx-look-and-feel-for-swing/
> >
> > Recently I was convinced though that we should move forward with the
> > Java laf: Swing has still lots to say, and JavaFX is not yet as
> > integrated with OpenJDK as it should be (especially in Linux
> > distribution, although is more popular within the OSX and Windows
> > communities), but before I move forward (and get to propose a JEP for
> > this) I would like some early feedback and gather some ideas/potential
> > interest :)
> >
> > Another possible implementation would be based on QT, which is even
> > cross platform by itself.
> >
> > So to recap, what are your feelings about an official OpenJDK look and
> > feel collection?
> >
> > Cheers,
> > Mario
> >
> >
> >
> 





From alexander.potochkin at oracle.com  Thu Aug 28 11:53:58 2014
From: alexander.potochkin at oracle.com (Alexander Potochkin)
Date: Thu, 28 Aug 2014 15:53:58 +0400
Subject: <Swing Dev> <AWT Dev> [7u-dev] Request for Approval and Review:
 8056156: [TEST_BUG] Test javax/swing/JFileChooser/8046391/bug8046391.java
 fails in Windows
In-Reply-To: <53FEDA58.4030105@oracle.com>
References: <53FEDA58.4030105@oracle.com>
Message-ID: <53FF1856.2020708@oracle.com>


The fix looks fine

Thanks
alexp

On 8/28/2014 11:29 AM, Alexey Ivanov wrote:
> Hello,
>
> Could you please approve the fix of the test in jdk7u-dev?
>
> Could you please review the fix?
>
>   webrev: http://cr.openjdk.java.net/~aivanov/8056156/jdk7/webrev.00/
>   JBS: https://bugs.openjdk.java.net/browse/JDK-8056156
>
> Description:
> The test fails to compile under jdk7 because of lambda expression.
>
> The fix:
> Convert lambda expression to anonymous class.
>
>
> Thank you in advance,
> Alexey.



From otaviojava at java.net  Sat Aug 30 13:12:45 2014
From: otaviojava at java.net (=?UTF-8?Q?Ot=C3=A1vio_Gon=C3=A7alves_de_Santana?=)
Date: Sat, 30 Aug 2014 10:12:45 -0300
Subject: <Swing Dev> Replace concat String to append in StringBuilder
	parameters
In-Reply-To: <C82621D2-D936-4A2F-B0AD-AB39E9EA694D@oracle.com>
References: <CAPc8kR3duvby+hfpAUQG5Z6rMPq-MzMv=Th7itQZHfkg_YvxDw@mail.gmail.com>
	<53E7FA44.9050207@oracle.com>
	<CAPc8kR1HPrLMP6qNzSr5Fe0y=eUDioh5BoVNsZ7q2mtgM_dSDQ@mail.gmail.com>
	<CAM6ZMz_nz2zWZQLLaKSnv4Z4Aah5MKaNspctn4TFKrciK2yXyg@mail.gmail.com>
	<476830A4-7A8E-4652-A0C7-805687155F4A@oracle.com>
	<CAPc8kR3Tet4HcxGuMywaLHZLVdkeEVNDkea5GtMjoBWD7X7yPg@mail.gmail.com>
	<CAM6ZMz-U5C0mXXcebb84TYq318zSorNrdKHC+h=4JpBO=ma9VA@mail.gmail.com>
	<53E8CCD6.2090503@CoSoCo.de> <53FDA7C1.6060303@CoSoCo.de>
	<902B0B7A-32BE-498A-B9DD-8937960430A2@oracle.com>
	<53FF7244.2030804@CoSoCo.de>
	<C82621D2-D936-4A2F-B0AD-AB39E9EA694D@oracle.com>
Message-ID: <CAPc8kR0pd8EuNiwcNafkDP43PBSORoRFaEWUge+Hknr=WeTBQw@mail.gmail.com>

I believe yes.

Using the -XX:+OptimizeStringConcat:
java  -jar -XX:+OptimizeStringConcat target/microbenchmarks.jar
".*StringBuilderConcatBenchMark.*" -wi 10 -i 10 -f 1

The same thing happened:

Benchmark                                                  Mode   Samples
      Mean   Mean error    Units
m.StringBuilderConcatBenchMark.stringBuilder              thrpt        10
 6316489.783   211751.479    ops/s
m.StringBuilderConcatBenchMark.stringBuilderWithConcat    thrpt        10
 3206244.215    60752.652    ops/s

So, can you review these changes, please.
https://bugs.openjdk.java.net/browse/JDK-8055723

http://cr.openjdk.java.net/~weijun/8055723/client/webrev.02/
http://cr.openjdk.java.net/~weijun/8055723/core/webrev.02/
http://cr.openjdk.java.net/~weijun/8055723/core/webrev.03/


On Fri, Aug 29, 2014 at 5:01 AM, Wang Weijun <weijun.wang at oracle.com> wrote:

> So it's not that the optimization fails but there is no optimization on
> them yet.
>
> I do see the .append("x") case will be easy to deal with, but it looks
> like historically javac has not been a place to do many optimizations. It
> mostly converts the java source to byte codes in a 1-to-1 mapping and let
> VM do whatever it wants (to optimize). When you talked about compiling
> multiple concatenation into using a single StringBuilder, it's more like
> choosing the correct implementation rather than an optimization.
>
> I don't expect to see big change on this in the near future, so shall we
> go on with the current enhancement?
>
> Thanks
> Max
>
> On Aug 29, 2014, at 2:17, Ulf Zibis <Ulf.Zibis at CoSoCo.de> wrote:
>
> > I mean:
> > It does not output byte code that only uses a single char array to
> compose the entire String in question.
> > With "optimization fails", I also mean, there is used an additional
> "StringComposer" e.g. another StringBuilder or a StringJoiner in addition
> to the 1st StringBuilder.
> >
> > -Ulf
> >
> > Am 27.08.2014 um 14:02 schrieb Pavel Rappo:
> >> Could you please explain what you mean by "javac optimization fails"
> here?
> >>
> >> -Pavel
> >>
> >> On 27 Aug 2014, at 10:41, Ulf Zibis <Ulf.Zibis at CoSoCo.de> wrote:
> >>
> >>> 4.) Now we see, that javac optimization fails again if StringBuilder,
> concatenation, toString(), append(String), append(Collection) etc. and
> StringJoiner use is mixed.
> >>
> >
>
>


-- 
Ot?vio Gon?alves de Santana

blog:     http://otaviosantana.blogspot.com.br/
twitter: http://twitter.com/otaviojava
site:     *http://about.me/otaviojava <http://about.me/otaviojava>*
55 (11) 98255-3513
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/swing-dev/attachments/20140830/6d45163e/attachment.html>