Merge
authorlana
Wed, 28 Dec 2011 10:52:11 -0800
changeset 11382 9bd385be6f03
parent 11381 890ea587d133 (diff)
parent 11325 0ff7113a0882 (current diff)
child 11383 ae090403accf
Merge
jdk/src/share/classes/com/sun/tools/jdi/LinkedHashMap.java
jdk/src/share/classes/sun/awt/FocusingTextField.java
jdk/src/share/classes/sun/awt/HorizBagLayout.java
jdk/src/share/classes/sun/awt/OrientableFlowLayout.java
jdk/src/share/classes/sun/awt/VariableGridLayout.java
jdk/src/share/classes/sun/awt/VerticalBagLayout.java
--- a/langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java	Wed Jul 05 17:58:33 2017 +0200
+++ b/langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java	Wed Dec 28 10:52:11 2011 -0800
@@ -284,7 +284,7 @@
         try {
             ct.analyze();
         } catch (Throwable ex) {
-            throw new AssertionError("Error thron when compiling the following code:\n" + source.getCharContent(true));
+            throw new AssertionError("Error thrown when compiling the following code:\n" + source.getCharContent(true));
         }
         check();
     }
--- a/langtools/test/tools/javac/generics/inference/7086601/T7086601b.java	Wed Jul 05 17:58:33 2017 +0200
+++ b/langtools/test/tools/javac/generics/inference/7086601/T7086601b.java	Wed Dec 28 10:52:11 2011 -0800
@@ -146,7 +146,7 @@
         try {
             ct.analyze();
         } catch (Throwable ex) {
-            throw new AssertionError("Error thron when compiling the following code:\n" + source.getCharContent(true));
+            throw new AssertionError("Error thrown when compiling the following code:\n" + source.getCharContent(true));
         }
         check();
     }
--- a/langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java	Wed Jul 05 17:58:33 2017 +0200
+++ b/langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java	Wed Dec 28 10:52:11 2011 -0800
@@ -210,7 +210,7 @@
         try {
             ct.analyze();
         } catch (Throwable ex) {
-            throw new AssertionError("Error thron when compiling the following code:\n" + source.getCharContent(true));
+            throw new AssertionError("Error thrown when compiling the following code:\n" + source.getCharContent(true));
         }
         check();
     }
--- a/langtools/test/tools/javac/lambda/LambdaParserTest.java	Wed Jul 05 17:58:33 2017 +0200
+++ b/langtools/test/tools/javac/lambda/LambdaParserTest.java	Wed Dec 28 10:52:11 2011 -0800
@@ -238,7 +238,7 @@
         try {
             ct.parse();
         } catch (Throwable ex) {
-            throw new AssertionError("Error thron when parsing the following source:\n" + source.getCharContent(true));
+            throw new AssertionError("Error thrown when parsing the following source:\n" + source.getCharContent(true));
         }
         check();
     }