diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml | |
parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml')
-rw-r--r-- | java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml index 0e46f59ecbed..044b34e70faf 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml @@ -37,11 +37,13 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,_,!null,_->!null;_,_,null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.ExtendedMessageFormat java.text.Format getFormat(java.lang.String)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.ExtendedMessageFormat java.text.ParsePosition next(java.text.ParsePosition) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -422,6 +424,9 @@ <item name="org.apache.commons.lang.text.StrLookup org.apache.commons.lang.text.StrLookup mapLookup(java.util.Map)"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.text.StrLookup.MapStrLookup java.lang.String lookup(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.text.StrMatcher int isMatch(char[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -503,6 +508,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(char[], int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -511,6 +517,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -519,6 +526,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -527,6 +535,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.String, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -535,6 +544,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.StringBuffer) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -543,6 +553,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.StringBuffer, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -551,6 +562,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(org.apache.commons.lang.text.StrBuilder) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -559,6 +571,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(org.apache.commons.lang.text.StrBuilder, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -567,10 +580,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String resolveVariable(java.lang.String, org.apache.commons.lang.text.StrBuilder, int, int) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String resolveVariable(java.lang.String, org.apache.commons.lang.text.StrBuilder, int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.text.StrSubstitutor org.apache.commons.lang.text.StrSubstitutor setVariablePrefix(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -613,6 +630,18 @@ <item name="org.apache.commons.lang.text.StrTokenizer int readWithQuotes(char[], int, int, org.apache.commons.lang.text.StrBuilder, java.util.List, int, int) 3"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.text.StrTokenizer java.lang.Object clone()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String getContent()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String nextToken()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String previousToken()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> |