diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
tree | bca7d49005d81d10c70bc3f547df041c636b4300 /plugins/properties/properties-psi-api/src/com/intellij/lang/properties/ResourceBundle.java | |
parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/properties/properties-psi-api/src/com/intellij/lang/properties/ResourceBundle.java')
-rw-r--r-- | plugins/properties/properties-psi-api/src/com/intellij/lang/properties/ResourceBundle.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/ResourceBundle.java b/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/ResourceBundle.java index 7ea56269949d..b53cdae358f0 100644 --- a/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/ResourceBundle.java +++ b/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/ResourceBundle.java @@ -26,8 +26,8 @@ import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiDirectory; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.List; @@ -38,26 +38,34 @@ public abstract class ResourceBundle { public abstract List<PropertiesFile> getPropertiesFiles(); /** - * @deprecated, use getPropertiesFiles() instead this method + * @deprecated use getPropertiesFiles() instead this method */ @Deprecated @NotNull - public abstract List<PropertiesFile> getPropertiesFiles(final Project project); + public List<PropertiesFile> getPropertiesFiles(final Project project) { + return getPropertiesFiles(); + } @NotNull public abstract PropertiesFile getDefaultPropertiesFile(); /** - * @deprecated, use getDefaultPropertiesFile() instead this method + * @deprecated use getDefaultPropertiesFile() instead this method */ @Deprecated @NotNull - public abstract PropertiesFile getDefaultPropertiesFile(final Project project); + public PropertiesFile getDefaultPropertiesFile(final Project project) { + return getDefaultPropertiesFile(); + } @NotNull public abstract String getBaseName(); - @NotNull + /** + * @return null if resource bundle is not default ( == instance of ResourceBundleImpl) + */ + @Deprecated + @Nullable public abstract VirtualFile getBaseDirectory(); @NotNull |