From aaea8f4c7cae7940bc95aa8e080b15e40e7e4194 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <malenkov@openjdk.org>
Date: Fri, 21 Feb 2014 15:28:09 +0400
Subject: [PATCH] 8035310: The line.separator property can be retrieved via
 public API

Reviewed-by: alexsch, serb
---
 .../classes/javax/swing/plaf/basic/BasicOptionPaneUI.java    | 3 +--
 jdk/src/share/classes/javax/swing/text/AbstractWriter.java   | 5 +----
 jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java | 4 +---
 jdk/src/share/classes/sun/font/CompositeFont.java            | 3 +--
 jdk/src/solaris/classes/sun/awt/X11/XAWTFormatter.java       | 3 +--
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
index b55f8ab0fbc..c58f4d35f0e 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
@@ -109,8 +109,7 @@ public class BasicOptionPaneUI extends OptionPaneUI {
 
 
     static {
-        newline = java.security.AccessController.doPrivileged(
-                                new GetPropertyAction("line.separator"));
+        newline = System.lineSeparator();
         if (newline == null) {
             newline = "\n";
         }
diff --git a/jdk/src/share/classes/javax/swing/text/AbstractWriter.java b/jdk/src/share/classes/javax/swing/text/AbstractWriter.java
index 440ee5bb7cb..c0f3b4f3cc9 100644
--- a/jdk/src/share/classes/javax/swing/text/AbstractWriter.java
+++ b/jdk/src/share/classes/javax/swing/text/AbstractWriter.java
@@ -141,10 +141,7 @@ public abstract class AbstractWriter {
             setLineSeparator((String)docNewline);
         }
         else {
-            String newline = null;
-            try {
-                newline = System.getProperty("line.separator");
-            } catch (SecurityException se) {}
+            String newline = System.lineSeparator();
             if (newline == null) {
                 // Should not get here, but if we do it means we could not
                 // find a newline string, use \n in this case.
diff --git a/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java b/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java
index 55d75fb7364..e5db094a910 100644
--- a/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java
+++ b/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java
@@ -317,9 +317,7 @@ public class DefaultEditorKit extends EditorKit {
         int offs = pos;
         Object endOfLineProperty = doc.getProperty(EndOfLineStringProperty);
         if (endOfLineProperty == null) {
-            try {
-                endOfLineProperty = System.getProperty("line.separator");
-            } catch (SecurityException se) { }
+            endOfLineProperty = System.lineSeparator();
         }
         String endOfLine;
         if (endOfLineProperty instanceof String) {
diff --git a/jdk/src/share/classes/sun/font/CompositeFont.java b/jdk/src/share/classes/sun/font/CompositeFont.java
index 54329695d49..f2defd79771 100644
--- a/jdk/src/share/classes/sun/font/CompositeFont.java
+++ b/jdk/src/share/classes/sun/font/CompositeFont.java
@@ -447,8 +447,7 @@ public final class CompositeFont extends Font2D {
     }
 
     public String toString() {
-        String ls = java.security.AccessController.doPrivileged(
-                new sun.security.action.GetPropertyAction("line.separator"));
+        String ls = System.lineSeparator();
         String componentsStr = "";
         for (int i=0; i<numSlots; i++) {
             componentsStr += "    Slot["+i+"]="+getSlotFont(i)+ls;
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAWTFormatter.java b/jdk/src/solaris/classes/sun/awt/X11/XAWTFormatter.java
index a2145dcc3c2..198d7a79508 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XAWTFormatter.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XAWTFormatter.java
@@ -43,8 +43,7 @@ public class XAWTFormatter extends java.util.logging.Formatter {
 
     // Line separator string.  This is the value of the line.separator
     // property at the moment that the SimpleFormatter was created.
-    private String lineSeparator = java.security.AccessController.doPrivileged(
-               new sun.security.action.GetPropertyAction("line.separator"));
+    private String lineSeparator = System.lineSeparator();
 
     boolean displayFullRecord = false;
     boolean useANSI = false;