# HG changeset patch # User serb # Date 1422279167 -10800 # Node ID 6abfec1a15d2ffd30c3b041009c82b5f0120a158 # Parent 66d8297e30096e6d2be87c1e46a32d226435acfb 8069015: Re-examine Solaris/Linux java.desktop dependency on java.logging Reviewed-by: azvegint, ant diff -r 66d8297e3009 -r 6abfec1a15d2 jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTFormatter.java --- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTFormatter.java Mon Jan 26 12:37:20 2015 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ -/* - * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.awt.X11; - -import java.util.logging.*; -import java.text.*; -import java.util.*; -import java.io.*; - -/** - * Formatter class providing ANSI output. Based on java.util.logging.SimpleFormatter sources. - */ - -public class XAWTFormatter extends java.util.logging.Formatter { - Date dat = new Date(); - private final static String format = "{0,date} {0,time}"; - private MessageFormat formatter; - - private Object args[] = new Object[1]; - - // Line separator string. This is the value of the line.separator - // property at the moment that the SimpleFormatter was created. - private String lineSeparator = System.lineSeparator(); - - boolean displayFullRecord = false; - boolean useANSI = false; - boolean showDate = true; - boolean showLevel = true; - boolean swapMethodClass = false; - public XAWTFormatter() { - displayFullRecord = "true".equals(LogManager.getLogManager().getProperty("XAWTFormatter.displayFullRecord")); - useANSI = "true".equals(LogManager.getLogManager().getProperty("XAWTFormatter.useANSI")); - showDate = !"false".equals(LogManager.getLogManager().getProperty("XAWTFormatter.showDate")); - showLevel = !"false".equals(LogManager.getLogManager().getProperty("XAWTFormatter.showLevel")); - swapMethodClass = "true".equals(LogManager.getLogManager().getProperty("XAWTFormatter.swapMethodClass")); - } - - /** - * Format the given LogRecord. - * @param record the log record to be formatted. - * @return a formatted log record - */ - public synchronized String format(LogRecord record) { - StringBuffer sb = new StringBuffer(); - if (useANSI) { - Level lev = record.getLevel(); - if (Level.FINEST.equals(lev)) { - sb.append(""); - } else if (Level.FINER.equals(lev)) { - sb.append(""); - } else if (Level.FINE.equals(lev)) { - sb.append(""); - } - } - if (displayFullRecord) { - if (showDate) { - // Minimize memory allocations here. - dat.setTime(record.getMillis()); - args[0] = dat; - StringBuffer text = new StringBuffer(); - if (formatter == null) { - formatter = new MessageFormat(format); - } - formatter.format(args, text, null); - sb.append(text); - sb.append(" "); - } else { - sb.append(" "); - } - if (swapMethodClass) { - if (record.getSourceMethodName() != null) { - sb.append(" "); - sb.append(record.getSourceMethodName()); - sb.append(" "); - } - if (record.getSourceClassName() != null) { - sb.append(record.getSourceClassName()); - } else { - sb.append(record.getLoggerName()); - } - } else { - if (record.getSourceClassName() != null) { - sb.append(record.getSourceClassName()); - } else { - sb.append(record.getLoggerName()); - } - if (record.getSourceMethodName() != null) { - sb.append(" "); - sb.append(record.getSourceMethodName()); - sb.append(""); - } - } - sb.append(lineSeparator); - } - if (useANSI) { - Level lev = record.getLevel(); - if (Level.FINEST.equals(lev)) { - sb.append(""); - } else if (Level.FINER.equals(lev)) { - sb.append(""); - } else if (Level.FINE.equals(lev)) { - sb.append(""); - } - } - if (showLevel) { - sb.append(record.getLevel().getLocalizedName()); - sb.append(": "); - } - String message = formatMessage(record); - sb.append(message); - sb.append(lineSeparator); - if (record.getThrown() != null) { - try { - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - record.getThrown().printStackTrace(pw); - pw.close(); - sb.append(sw.toString()); - } catch (Exception ex) { - } - } - if (useANSI) { - sb.append(""); - } - return sb.toString(); - } -} diff -r 66d8297e3009 -r 6abfec1a15d2 jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java --- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java Mon Jan 26 12:37:20 2015 +0300 +++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java Mon Jan 26 16:32:47 2015 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,15 +25,17 @@ package sun.awt.X11; +import java.awt.AWTKeyStroke; +import java.awt.Toolkit; + import sun.awt.EmbeddedFrame; -import java.awt.*; -import java.awt.AWTKeyStroke; -import java.util.logging.Logger; +import sun.util.logging.PlatformLogger; @SuppressWarnings("serial") // JDK-implementation class public class XEmbeddedFrame extends EmbeddedFrame { - private static final Logger log = Logger.getLogger(XEmbeddedFrame.class.getName()); + private static final PlatformLogger log = + PlatformLogger.getLogger(XEmbeddedFrame.class.getName()); long handle; public XEmbeddedFrame() {