Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Brychcy2019-07-18 09:45:12 +0000
committerTill Brychcy2019-07-18 11:06:36 +0000
commit05678aa06f4b71450429d697e039226fa57ddccb (patch)
tree992c4c31eb9fd78069368498bc5247dafb5a49be
parentee01396d04369bba48f1089d31dad2174198b35e (diff)
downloadeclipse.jdt.core-05678aa06f4b71450429d697e039226fa57ddccb.tar.gz
eclipse.jdt.core-05678aa06f4b71450429d697e039226fa57ddccb.tar.xz
eclipse.jdt.core-05678aa06f4b71450429d697e039226fa57ddccb.zip
Bug 549384 - [ecj][null] Error message for nullAnnot syntax is wrongI20190720-1800I20190719-1800I20190718-1800
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationBatchCompilerTest.java2
-rw-r--r--org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties2
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationBatchCompilerTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationBatchCompilerTest.java
index d2d84330bb..f40a8aa446 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationBatchCompilerTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationBatchCompilerTest.java
@@ -308,7 +308,7 @@ public class NullAnnotationBatchCompilerTest extends AbstractBatchCompilerTest {
+ " -1.5"
+ " -warn:+nullAnnot(foo|bar) -warn:+null -nonNullByDefault -proc:none -d \"" + OUTPUT_DIR + "\"",
"",
- "Token nullAnnot(foo|bar) is not in the expected format \"nullAnnot(<non null annotation name> | <nullable annotation name> | <non-null by default annotation name>)\"\n",
+ "Token nullAnnot(foo|bar) is not in the expected format \"nullAnnot(<nullable annotation name> | <non null annotation name> | <non-null by default annotation name>)\"\n",
true);
}
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
index b4780afc74..bbdb0955b7 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
@@ -142,7 +142,7 @@ configure.differentencodings=Found encoding {0}. Different encodings were specif
configure.differentencoding=Found encoding {0}. A different encoding was specified: {1}
### null annotations
-configure.invalidNullAnnot = Token {0} is not in the expected format "nullAnnot(<non null annotation name> | <nullable annotation name> | <non-null by default annotation name>)"
+configure.invalidNullAnnot = Token {0} is not in the expected format "nullAnnot(<nullable annotation name> | <non null annotation name> | <non-null by default annotation name>)"
configure.missingAnnotationPath = Missing argument to -annotationpath at ''{0}''
### requestor

Back to the top