8005250: Downgrade normative references to ${java.home}/lib folder from Java client code.
Summary: Javadoc was changed in accordance with CCC-8005250 request.
Reviewed-by: alanb, amenkov
--- a/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java Mon Jan 14 18:31:48 2013 -0800
+++ b/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java Tue Jan 15 14:26:59 2013 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -56,11 +56,6 @@
* by the data transfer subsystem to transfer data between Java and native
* applications, and between Java applications in separate VMs.
* <p>
- * In the Sun reference implementation, the default SystemFlavorMap is
- * initialized by the file <code>jre/lib/flavormap.properties</code> and the
- * contents of the URL referenced by the AWT property
- * <code>AWT.DnD.flavorMapFileURL</code>. See <code>flavormap.properties</code>
- * for details.
*
* @since 1.2
*/
@@ -1213,7 +1208,7 @@
* are equal according to <code>String.equals(Object)</code>.</li>
* </ul>
* <p>
- * Sun's reference implementation of this method returns the specified MIME
+ * The reference implementation of this method returns the specified MIME
* type <code>String</code> prefixed with <code>JAVA_DATAFLAVOR:</code>.
*
* @param mimeType the MIME type to encode
@@ -1241,7 +1236,7 @@
* according to <code>String.equals(Object)</code>.</li>
* </ul>
* <p>
- * Sun's reference implementation of this method returns the MIME type
+ * The reference implementation of this method returns the MIME type
* <code>String</code> of the specified <code>DataFlavor</code> prefixed
* with <code>JAVA_DATAFLAVOR:</code>.
*
--- a/jdk/src/share/classes/javax/imageio/spi/IIORegistry.java Mon Jan 14 18:31:48 2013 -0800
+++ b/jdk/src/share/classes/javax/imageio/spi/IIORegistry.java Tue Jan 15 14:26:59 2013 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, 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
@@ -64,9 +64,9 @@
* <code>ImageWriter</code>, <code>ImageTranscoder</code>,
* <code>ImageInputStream</code>, and <code>ImageOutputStream</code>.
*
- * <p> Service providers found on the system classpath (<i>e.g.</i>,
- * the <code>jre/lib/ext</code> directory in Sun's implementation of
- * JDK) are automatically loaded as soon as this class is
+ * <p> Service providers found on the system classpath (typically
+ * the <code>lib/ext</code> directory in the Java
+ * installation directory) are automatically loaded as soon as this class is
* instantiated.
*
* <p> When the <code>registerApplicationClasspathSpis</code> method
@@ -226,8 +226,10 @@
private void registerInstalledProviders() {
/*
- We need load installed providers from lib/ext
- directory in the privileged mode in order to
+ We need to load installed providers from the
+ system classpath (typically the <code>lib/ext</code>
+ directory in in the Java installation directory)
+ in the privileged mode in order to
be able read corresponding jar files even if
file read capability is restricted (like the
applet context case).
--- a/jdk/src/share/classes/javax/sound/midi/MidiSystem.java Mon Jan 14 18:31:48 2013 -0800
+++ b/jdk/src/share/classes/javax/sound/midi/MidiSystem.java Tue Jan 15 14:26:59 2013 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, 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
@@ -68,8 +68,10 @@
*
* <p>Properties can be used to specify default MIDI devices.
* Both system properties and a properties file are considered.
- * The properties file is "lib/sound.properties" in the JRE
- * directory. If a property exists both as a system property and in the
+ * The <code>sound.properties</code> properties file is read from
+ * an implementation-specific location (typically it is the <code>lib</code>
+ * directory in the Java installation directory).
+ * If a property exists both as a system property and in the
* properties file, the system property takes precedence. If none is
* specified, a suitable default is chosen among the available devices.
* The syntax of the properties file is specified in
--- a/jdk/src/share/classes/javax/sound/sampled/AudioSystem.java Mon Jan 14 18:31:48 2013 -0800
+++ b/jdk/src/share/classes/javax/sound/sampled/AudioSystem.java Tue Jan 15 14:26:59 2013 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, 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
@@ -63,9 +63,10 @@
* <p>Properties can be used to specify the default mixer
* for specific line types.
* Both system properties and a properties file are considered.
- * In the Oracle reference implementation, the properties file is
- * "lib/sound.properties" in the JRE
- * directory. If a property exists both as a system property and in the
+ * The <code>sound.properties</code> properties file is read from
+ * an implementation-specific location (typically it is the <code>lib</code>
+ * directory in the Java installation directory).
+ * If a property exists both as a system property and in the
* properties file, the system property takes precedence. If none is
* specified, a suitable default is chosen among the available devices.
* The syntax of the properties file is specified in
--- a/jdk/src/share/classes/javax/swing/UIManager.java Mon Jan 14 18:31:48 2013 -0800
+++ b/jdk/src/share/classes/javax/swing/UIManager.java Tue Jan 15 14:26:59 2013 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -105,8 +105,9 @@
* exists and contains the key <code>swing.defaultlaf</code>,
* use its value as the default look and feel class name. The location
* that is checked for <code>swing.properties</code> may vary depending
- * upon the implementation of the Java platform. In Sun's implementation
- * the location is <code>${java.home}/lib/swing.properties</code>.
+ * upon the implementation of the Java platform. Typically the
+ * <code>swing.properties</code> file is located in the <code>lib</code>
+ * subdirectory of the Java installation directory.
* Refer to the release notes of the implementation being used for
* further details.
* <li>Otherwise use the cross platform look and feel.
@@ -256,7 +257,7 @@
}
- /* Keys used for the properties file in <java.home>/lib/swing.properties.
+ /* Keys used in the <code>swing.properties</code> properties file.
* See loadUserProperties(), initialize().
*/
@@ -267,7 +268,7 @@
private static final String disableMnemonicKey = "swing.disablenavaids";
/**
- * Return a swing.properties file key for the attribute of specified
+ * Return a <code>swing.properties</code> file key for the attribute of specified
* look and feel. The attr is either "name" or "class", a typical
* key would be: "swing.installedlaf.windows.name"
*/
@@ -276,9 +277,11 @@
}
/**
- * The filename for swing.properties is a path like this (Unix version):
- * <java.home>/lib/swing.properties. This method returns a bogus
- * filename if java.home isn't defined.
+ * The location of the <code>swing.properties</code> property file is
+ * implementation-specific.
+ * It is typically located in the <code>lib</code> subdirectory of the Java
+ * installation directory. This method returns a bogus filename
+ * if <code>java.home</code> isn't defined.
*/
private static String makeSwingPropertiesFilename() {
String sep = File.separator;
@@ -352,7 +355,7 @@
/**
* The default value of <code>installedLAFS</code> is used when no
- * swing.properties
+ * <code>swing.properties</code>
* file is available or if the file doesn't contain a "swing.installedlafs"
* property.
*
@@ -1271,7 +1274,8 @@
/**
- * If a swing.properties file exist and it has a swing.installedlafs property
+ * If a <code>swing.properties</code> file exist and it has a
+ * <code>swing.installedlafs</code> property
* then initialize the <code>installedLAFs</code> field.
*
* @see #getInstalledLookAndFeels