1 files changed, 9 insertions, 23 deletions
diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java
index 36915e7e6962..bae39bd9f2d0 100644
--- a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java
+++ b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java
@@ -23,14 +23,10 @@ import com.intellij.ide.presentation.Presentation;
 import com.intellij.lang.properties.PropertiesImplUtil;
 import com.intellij.lang.properties.PropertiesUtil;
 import com.intellij.lang.properties.ResourceBundle;
-import com.intellij.lang.properties.psi.PropertiesFile;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileSystem;
-import com.intellij.psi.PsiManager;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,25 +34,15 @@ import java.io.OutputStream;
 
 @Presentation(icon = "AllIcons.Nodes.ResourceBundle")
 public class ResourceBundleAsVirtualFile extends VirtualFile {
-  private final VirtualFile myBasePropertiesFile;
+  private final ResourceBundle myResourceBundle;
 
-  private ResourceBundleAsVirtualFile(@NotNull final VirtualFile basePropertiesFile) {
-    myBasePropertiesFile = basePropertiesFile;
+  public ResourceBundleAsVirtualFile(@NotNull final ResourceBundle resourceBundle) {
+    myResourceBundle = resourceBundle;
   }
 
   @NotNull
-  public static ResourceBundleAsVirtualFile fromResourceBundle(final @NotNull ResourceBundle resourceBundle) {
-    return new ResourceBundleAsVirtualFile(resourceBundle.getDefaultPropertiesFile().getVirtualFile());
-  }
-
-  @Nullable
-  public ResourceBundle getResourceBundle(final Project project) {
-    final PsiManager psiManager = PsiManager.getInstance(project);
-    final PropertiesFile file = PropertiesImplUtil.getPropertiesFile(psiManager.findFile(myBasePropertiesFile));
-    if (file == null) {
-      return null;
-    }
-    return PropertiesImplUtil.getResourceBundle(file);
+  public ResourceBundle getResourceBundle() {
+    return myResourceBundle;
   }
 
   @Override
@@ -74,7 +60,7 @@ public class ResourceBundleAsVirtualFile extends VirtualFile {
   @Override
   @NotNull
   public String getName() {
-    return PropertiesUtil.getBaseName(myBasePropertiesFile);
+    return myResourceBundle.getBaseName();
   }
 
   public boolean equals(final Object o) {
@@ -83,13 +69,13 @@ public class ResourceBundleAsVirtualFile extends VirtualFile {
 
     final ResourceBundleAsVirtualFile resourceBundleAsVirtualFile = (ResourceBundleAsVirtualFile)o;
 
-    if (!myBasePropertiesFile.equals(resourceBundleAsVirtualFile.myBasePropertiesFile)) return false;
+    if (!myResourceBundle.equals(resourceBundleAsVirtualFile.myResourceBundle)) return false;
 
     return true;
   }
 
   public int hashCode() {
-    return myBasePropertiesFile.hashCode();
+    return myResourceBundle.hashCode();
   }
 
   @Override
@@ -114,7 +100,7 @@ public class ResourceBundleAsVirtualFile extends VirtualFile {
 
   @Override
   public VirtualFile getParent() {
-    return myBasePropertiesFile.getParent();
+    return myResourceBundle.getBaseDirectory();
   }
 
   @Override