align any particular field, or find out where it is for selection
@@ -143,10 +143,13 @@
public abstract class DateFormat extends Format {
/**
- * The calendar that DateFormat uses to produce the time field
- * values needed to implement date and time formatting. Subclasses should
- * initialize this to a calendar appropriate for the locale associated with
- * this DateFormat.
+ * The {@link Calendar} instance used for calculating the date-time fields
+ * and the instant of time. This field is used for both formatting and
+ * parsing.
+ *
+ * Subclasses should initialize this field to a {@link Calendar}
+ * appropriate for the {@link Locale} associated with this
+ * DateFormat.
* @serial
*/
protected Calendar calendar;
@@ -358,15 +361,21 @@
/**
* Parse a date/time string according to the given parse position. For
- * example, a time text "07/10/96 4:5 PM, PDT" will be parsed into a Date
- * that is equivalent to Date(837039928046).
+ * example, a time text {@code "07/10/96 4:5 PM, PDT"} will be parsed into a {@code Date}
+ * that is equivalent to {@code Date(837039900000L)}.
*
*
By default, parsing is lenient: If the input is not in the form used
* by this object's format method but can still be parsed as a date, then
* the parse succeeds. Clients may insist on strict adherence to the
- * format by calling setLenient(false).
+ * format by calling {@link #setLenient(boolean) setLenient(false)}.
*
- * @see java.text.DateFormat#setLenient(boolean)
+ *
This parsing operation uses the {@link #calendar} to produce
+ * a {@code Date}. As a result, the {@code calendar}'s date-time
+ * fields and the {@code TimeZone} value may have been
+ * overwritten, depending on subclass implementations. Any {@code
+ * TimeZone} value that has previously been set by a call to
+ * {@link #setTimeZone(java.util.TimeZone) setTimeZone} may need
+ * to be restored for further operations.
*
* @param source The date/time string to be parsed
*
@@ -374,7 +383,7 @@
* output, the position at which parsing terminated, or the
* start position if the parse failed.
*
- * @return A Date, or null if the input could not be parsed
+ * @return A {@code Date}, or {@code null} if the input could not be parsed
*/
public abstract Date parse(String source, ParsePosition pos);
@@ -569,7 +578,12 @@
/**
* Set the calendar to be used by this date format. Initially, the default
* calendar for the specified or default locale is used.
- * @param newCalendar the new Calendar to be used by the date format
+ *
+ *
Any {@link java.util.TimeZone TimeZone} and {@linkplain
+ * #isLenient() leniency} values that have previously been set are
+ * overwritten by {@code newCalendar}'s values.
+ *
+ * @param newCalendar the new {@code Calendar} to be used by the date format
*/
public void setCalendar(Calendar newCalendar)
{
@@ -578,6 +592,7 @@
/**
* Gets the calendar associated with this date/time formatter.
+ *
* @return the calendar associated with this date/time formatter.
*/
public Calendar getCalendar()
@@ -605,7 +620,18 @@
}
/**
- * Sets the time zone for the calendar of this DateFormat object.
+ * Sets the time zone for the calendar of this {@code DateFormat} object.
+ * This method is equivalent to the following call.
+ *
+ * getCalendar().setTimeZone(zone)
+ *
+ *
+ * The {@code TimeZone} set by this method is overwritten by a
+ * {@link #setCalendar(java.util.Calendar) setCalendar} call.
+ *
+ *
The {@code TimeZone} set by this method may be overwritten as
+ * a result of a call to the parse method.
+ *
* @param zone the given new time zone.
*/
public void setTimeZone(TimeZone zone)
@@ -615,6 +641,11 @@
/**
* Gets the time zone.
+ * This method is equivalent to the following call.
+ *
+ * getCalendar().getTimeZone()
+ *
+ *
* @return the time zone associated with the calendar of DateFormat.
*/
public TimeZone getTimeZone()
@@ -627,8 +658,17 @@
* lenient parsing, the parser may use heuristics to interpret inputs that
* do not precisely match this object's format. With strict parsing,
* inputs must match this object's format.
- * @param lenient when true, parsing is lenient
- * @see java.util.Calendar#setLenient
+ *
+ * This method is equivalent to the following call.
+ *
+ * getCalendar().setLenient(lenient)
+ *
+ *
+ * This leniency value is overwritten by a call to {@link
+ * #setCalendar(java.util.Calendar) setCalendar()}.
+ *
+ * @param lenient when {@code true}, parsing is lenient
+ * @see java.util.Calendar#setLenient(boolean)
*/
public void setLenient(boolean lenient)
{
@@ -637,6 +677,14 @@
/**
* Tell whether date/time parsing is to be lenient.
+ * This method is equivalent to the following call.
+ *
+ * getCalendar().isLenient()
+ *
+ *
+ * @return {@code true} if the {@link #calendar} is lenient;
+ * {@code false} otherwise.
+ * @see java.util.Calendar#isLenient()
*/
public boolean isLenient()
{
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/src/share/classes/java/text/SimpleDateFormat.java
--- a/jdk/src/share/classes/java/text/SimpleDateFormat.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/src/share/classes/java/text/SimpleDateFormat.java Tue Apr 20 16:50:10 2010 -0700
@@ -1235,6 +1235,20 @@
* changed, the error index of pos is set to the index of
* the character where the error occurred, and null is returned.
*
+ * This parsing operation uses the {@link DateFormat#calendar
+ * calendar} to produce a {@code Date}. All of the {@code
+ * calendar}'s date-time fields are {@linkplain Calendar#clear()
+ * cleared} before parsing, and the {@code calendar}'s default
+ * values of the date-time fields are used for any missing
+ * date-time information. For example, the year value of the
+ * parsed {@code Date} is 1970 with {@link GregorianCalendar} if
+ * no year value is given from the parsing operation. The {@code
+ * TimeZone} value may be overwritten, depending on the given
+ * pattern and the time zone value in {@code text}. Any {@code
+ * TimeZone} value that has previously been set by a call to
+ * {@link #setTimeZone(java.util.TimeZone) setTimeZone} may need
+ * to be restored for further operations.
+ *
* @param text A String, part of which should be parsed.
* @param pos A ParsePosition object with index and error
* index information as described above.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java Tue Apr 20 16:50:10 2010 -0700
@@ -756,9 +756,8 @@
* things.
*
* -
- * Sets the associated component to opaque (can be changed
- * easily by a subclass or on JTextComponent directly),
- * which is the most common case. This will cause the
+ * Sets the associated component to opaque if the opaque property
+ * has not already been set by the client program. This will cause the
* component's background color to be painted.
*
-
* Installs the default caret and highlighter into the
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/src/windows/classes/sun/awt/windows/fontconfig.properties
--- a/jdk/src/windows/classes/sun/awt/windows/fontconfig.properties Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/src/windows/classes/sun/awt/windows/fontconfig.properties Tue Apr 20 16:50:10 2010 -0700
@@ -41,6 +41,7 @@
allfonts.lucida=Lucida Sans Regular
allfonts.symbol=Symbol
allfonts.thai=Lucida Sans Regular
+allfonts.georgian=Sylfaen
serif.plain.alphabetic=Times New Roman
serif.plain.chinese-ms950=MingLiU
@@ -237,7 +238,7 @@
sequence.fallback=lucida,\
chinese-ms950,chinese-hkscs,chinese-ms936,chinese-gb18030,\
- japanese,korean,chinese-ms950-extb,chinese-ms936-extb
+ japanese,korean,chinese-ms950-extb,chinese-ms936-extb,georgian
# Exclusion Ranges
@@ -296,3 +297,4 @@
filename.Symbol=SYMBOL.TTF
filename.Wingdings=WINGDING.TTF
+filename.Sylfaen=sylfaen.ttf
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/awt/font/NumericShaper/EasternArabicTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/font/NumericShaper/EasternArabicTest.java Tue Apr 20 16:50:10 2010 -0700
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2010 Sun Microsystems, Inc. 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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6941948
+ * @summary Make sure that EASTERN_ARABIC works with the enum interface.
+ */
+
+import java.awt.font.NumericShaper;
+import java.util.EnumSet;
+import static java.awt.font.NumericShaper.*;
+
+public class EasternArabicTest {
+ static NumericShaper ns_old, ns_new;
+ static boolean err = false;
+
+ static String[][] testData = {
+ // Arabic "October 10"
+ {"\u0623\u0643\u062a\u0648\u0628\u0631 10",
+ "\u0623\u0643\u062a\u0648\u0628\u0631 \u06f1\u06f0"}, // EASTERN_ARABIC digits
+
+ // Tamil "Year 2009"
+ {"\u0b86\u0ba3\u0bcd\u0b9f\u0bc1 2009",
+ "\u0b86\u0ba3\u0bcd\u0b9f\u0bc1 \u0be8\u0be6\u0be6\u0bef"},
+ // "\u0be800\u0bef is returned by pre-JDK7 because Tamil zero was not
+ // included in Unicode 4.0.0.
+
+ // Ethiopic "Syllable 2009"
+ {"\u1200 2009",
+ "\u1200 \u136a00\u1371"},
+ // Ethiopic zero doesn't exist even in Unicode 5.1.0.
+ };
+
+ public static void main(String[] args) {
+ ns_old = getContextualShaper(TAMIL|ETHIOPIC|EASTERN_ARABIC|ARABIC|THAI|LAO,
+ EUROPEAN);
+ ns_new = getContextualShaper(EnumSet.of(Range.THAI,
+ Range.TAMIL,
+ Range.ETHIOPIC,
+ Range.EASTERN_ARABIC,
+ Range.ARABIC,
+ Range.LAO),
+ Range.EUROPEAN);
+
+
+ StringBuilder cData = new StringBuilder();
+ StringBuilder cExpected = new StringBuilder();
+ for (int i = 0; i < testData.length; i++) {
+ String data = testData[i][0];
+ String expected = testData[i][1];
+ test(data, expected);
+ cData.append(data).append(' ');
+ cExpected.append(expected).append(' ');
+ }
+ test(cData.toString(), cExpected.toString());
+
+ if (err) {
+ throw new RuntimeException("shape() returned unexpected value.");
+ }
+ }
+
+ private static void test(String data, String expected) {
+ char[] text = data.toCharArray();
+ ns_old.shape(text, 0, text.length);
+ String got = new String(text);
+
+ if (!expected.equals(got)) {
+ err = true;
+ System.err.println("Error with traditional range.");
+ System.err.println(" text = " + data);
+ System.err.println(" got = " + got);
+ System.err.println(" expected = " + expected);
+ } else {
+ System.err.println("OK with traditional range.");
+ System.err.println(" text = " + data);
+ System.err.println(" got = " + got);
+ System.err.println(" expected = " + expected);
+ }
+
+ text = data.toCharArray();
+ ns_new.shape(text, 0, text.length);
+ got = new String(text);
+
+ if (!expected.equals(got)) {
+ err = true;
+ System.err.println("Error with new Enum range.");
+ System.err.println(" text = " + data);
+ System.err.println(" got = " + got);
+ System.err.println(" expected = " + expected);
+ } else {
+ System.err.println("OK with new Enum range.");
+ System.err.println(" text = " + data);
+ System.err.println(" got = " + got);
+ System.err.println(" expected = " + expected);
+ }
+ }
+}
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/Locale/Bug4175998Test.java
--- a/jdk/test/java/util/Locale/Bug4175998Test.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/Locale/Bug4175998Test.java Tue Apr 20 16:50:10 2010 -0700
@@ -32,16 +32,6 @@
*
* (C) Copyright IBM Corp. 1998 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4083270Test.java
--- a/jdk/test/java/util/ResourceBundle/Bug4083270Test.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4083270Test.java Tue Apr 20 16:50:10 2010 -0700
@@ -31,16 +31,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4165815Test.java
--- a/jdk/test/java/util/ResourceBundle/Bug4165815Test.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4165815Test.java Tue Apr 20 16:50:10 2010 -0700
@@ -34,16 +34,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4168625Class.java
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Class.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Class.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4168625Getter.java
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4168625Resource.java
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4177489Test.java
--- a/jdk/test/java/util/ResourceBundle/Bug4177489Test.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4177489Test.java Tue Apr 20 16:50:10 2010 -0700
@@ -32,16 +32,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java
--- a/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
diff -r 9031df3e55a7 -r 4114baee5fe9 jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java
--- a/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java Tue Apr 20 16:48:56 2010 -0700
+++ b/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java Tue Apr 20 16:50:10 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.