diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleImpl.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleImpl.java')
-rw-r--r-- | plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleImpl.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleImpl.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleImpl.java index d257824166e9..ca5c8aa39a36 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleImpl.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleImpl.java @@ -23,16 +23,13 @@ import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiFile; import com.intellij.util.SmartList; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import java.util.List; public class ResourceBundleImpl extends ResourceBundle { - @NonNls public static final String RESOURCE_BUNDLE_PREFIX = "resourceBundle:"; @NotNull private final PropertiesFile myDefaultPropertiesFile; public ResourceBundleImpl(@NotNull final PropertiesFile defaultPropertiesFile) { @@ -106,6 +103,6 @@ public class ResourceBundleImpl extends ResourceBundle { } public String getUrl() { - return RESOURCE_BUNDLE_PREFIX + getBaseDirectory() + "/" + getBaseName(); + return getBaseDirectory() + "/" + getBaseName(); } }
\ No newline at end of file |