diff options
Diffstat (limited to 'java/jdkAnnotations')
-rw-r--r-- | java/jdkAnnotations/java/util/annotations.xml | 42 | ||||
-rw-r--r-- | java/jdkAnnotations/java/util/regex/annotations.xml | 7 |
2 files changed, 28 insertions, 21 deletions
diff --git a/java/jdkAnnotations/java/util/annotations.xml b/java/jdkAnnotations/java/util/annotations.xml index 9699f06c123b..4d202ed84b61 100644 --- a/java/jdkAnnotations/java/util/annotations.xml +++ b/java/jdkAnnotations/java/util/annotations.xml @@ -462,12 +462,7 @@ <item name="java.util.Arrays void sort(short[], int, int) 0"> <annotation name="org.jetbrains.annotations.NotNull" /> </item> - <item name="java.util.Calendar void add(int, int) 0" > - <annotation name="org.intellij.lang.annotations.MagicConstant"> - <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> - </annotation> - </item> - <item name="java.util.Calendar void clear(int) 0" > + <item name="java.util.Calendar boolean isSet(int) 0"> <annotation name="org.intellij.lang.annotations.MagicConstant"> <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> </annotation> @@ -487,52 +482,57 @@ <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> </annotation> </item> - <item name="java.util.Calendar java.lang.String getDisplayName(int, int, java.util.Locale) 0"> + <item name="java.util.Calendar int getFirstDayOfWeek()"> <annotation name="org.intellij.lang.annotations.MagicConstant"> - <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> + <val name="intValues" val="{java.util.Calendar.SUNDAY, java.util.Calendar.MONDAY, java.util.Calendar.TUESDAY, java.util.Calendar.WEDNESDAY, java.util.Calendar.THURSDAY, java.util.Calendar.FRIDAY, java.util.Calendar.SATURDAY}" /> </annotation> </item> - <item name="java.util.Calendar java.lang.String getDisplayName(int, int, java.util.Locale) 1"> + <item name="java.util.Calendar int getGreatestMinimum(int) 0"> <annotation name="org.intellij.lang.annotations.MagicConstant"> - <val name="intValues" val="{java.util.Calendar.SHORT, java.util.Calendar.LONG}" /> + <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> </annotation> </item> - <item name="java.util.Calendar java.util.Map<java.lang.String,java.lang.Integer> getDisplayNames(int, int, java.util.Locale) 0"> + <item name="java.util.Calendar int getLeastMaximum(int) 0"> <annotation name="org.intellij.lang.annotations.MagicConstant"> <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> </annotation> </item> - <item name="java.util.Calendar java.util.Map<java.lang.String,java.lang.Integer> getDisplayNames(int, int, java.util.Locale) 1"> + <item name="java.util.Calendar int getMaximum(int) 0"> <annotation name="org.intellij.lang.annotations.MagicConstant"> - <val name="intValues" val="{java.util.Calendar.SHORT, java.util.Calendar.LONG, java.util.Calendar.ALL_STYLES}" /> + <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> </annotation> </item> - <item name="java.util.Calendar int getFirstDayOfWeek()"> + <item name="java.util.Calendar int getMinimum(int) 0"> <annotation name="org.intellij.lang.annotations.MagicConstant"> - <val name="intValues" val="{java.util.Calendar.SUNDAY, java.util.Calendar.MONDAY, java.util.Calendar.TUESDAY, java.util.Calendar.WEDNESDAY, java.util.Calendar.THURSDAY, java.util.Calendar.FRIDAY, java.util.Calendar.SATURDAY}" /> + <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> </annotation> </item> - <item name="java.util.Calendar int getGreatestMinimum(int) 0"> + <item name="java.util.Calendar java.lang.String getDisplayName(int, int, java.util.Locale) 0"> <annotation name="org.intellij.lang.annotations.MagicConstant"> <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> </annotation> </item> - <item name="java.util.Calendar int getLeastMaximum(int) 0"> + <item name="java.util.Calendar java.lang.String getDisplayName(int, int, java.util.Locale) 1"> <annotation name="org.intellij.lang.annotations.MagicConstant"> - <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> + <val name="intValues" val="{java.util.Calendar.SHORT, java.util.Calendar.LONG}" /> </annotation> </item> - <item name="java.util.Calendar int getMaximum(int) 0"> + <item name="java.util.Calendar java.util.Map<java.lang.String,java.lang.Integer> getDisplayNames(int, int, java.util.Locale) 0"> <annotation name="org.intellij.lang.annotations.MagicConstant"> <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> </annotation> </item> - <item name="java.util.Calendar int getMinimum(int) 0"> + <item name="java.util.Calendar java.util.Map<java.lang.String,java.lang.Integer> getDisplayNames(int, int, java.util.Locale) 1"> + <annotation name="org.intellij.lang.annotations.MagicConstant"> + <val name="intValues" val="{java.util.Calendar.SHORT, java.util.Calendar.LONG, java.util.Calendar.ALL_STYLES}" /> + </annotation> + </item> + <item name="java.util.Calendar void add(int, int) 0" > <annotation name="org.intellij.lang.annotations.MagicConstant"> <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> </annotation> </item> - <item name="java.util.Calendar boolean isSet(int) 0"> + <item name="java.util.Calendar void clear(int) 0" > <annotation name="org.intellij.lang.annotations.MagicConstant"> <val name="intValues" val="{java.util.Calendar.ERA, java.util.Calendar.YEAR, java.util.Calendar.MONTH, java.util.Calendar.WEEK_OF_YEAR, java.util.Calendar.WEEK_OF_MONTH, java.util.Calendar.DATE, java.util.Calendar.DAY_OF_MONTH, java.util.Calendar.DAY_OF_YEAR, java.util.Calendar.DAY_OF_WEEK, java.util.Calendar.DAY_OF_WEEK_IN_MONTH, java.util.Calendar.AM_PM, java.util.Calendar.HOUR, java.util.Calendar.HOUR_OF_DAY, java.util.Calendar.MINUTE, java.util.Calendar.SECOND, java.util.Calendar.MILLISECOND, java.util.Calendar.ZONE_OFFSET, java.util.Calendar.DST_OFFSET}" /> </annotation> diff --git a/java/jdkAnnotations/java/util/regex/annotations.xml b/java/jdkAnnotations/java/util/regex/annotations.xml index b3f189ef714a..2afbcb551b37 100644 --- a/java/jdkAnnotations/java/util/regex/annotations.xml +++ b/java/jdkAnnotations/java/util/regex/annotations.xml @@ -11,10 +11,17 @@ <val name="flagsFromClass" val="java.util.regex.Pattern.class" /> </annotation> </item> + <item name='java.util.regex.Pattern java.util.regex.Matcher matcher(java.lang.CharSequence)'> + <annotation name='org.jetbrains.annotations.NotNull'/> + </item> <item name="java.util.regex.Pattern java.util.regex.Pattern compile(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NonNls" /> <annotation name="org.jetbrains.annotations.NotNull" /> </item> + <item name="java.util.regex.Pattern java.util.regex.Pattern compile(java.lang.String, int) 0"> + <annotation name="org.jetbrains.annotations.NonNls" /> + <annotation name="org.jetbrains.annotations.NotNull" /> + </item> <item name="java.util.regex.Pattern java.util.regex.Pattern compile(java.lang.String, int) 1"> <annotation name="org.intellij.lang.annotations.MagicConstant"> <val name="flagsFromClass" val="java.util.regex.Pattern.class" /> |