diff --git a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddDirectoryConfirmationPanel.java b/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddDirectoryConfirmationPanel.java
index f8b3861d4beb..707f69efbb41 100644
--- a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddDirectoryConfirmationPanel.java
+++ b/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddDirectoryConfirmationPanel.java
@@ -10,6 +10,7 @@ import java.awt.*;
 /**
  * author: lesya
  */
+
 public class AddDirectoryConfirmationPanel extends AbstractAddFileConfirmationPanel{
   private FileLabel myFileLabel;
   private JPanel myPanel;
diff --git a/source/com/intellij/ide/projectView/impl/nodes/BasePsiNode.java b/source/com/intellij/ide/projectView/impl/nodes/BasePsiNode.java
index 9656e70f60ad..da4bc36c5ece 100644
--- a/source/com/intellij/ide/projectView/impl/nodes/BasePsiNode.java
+++ b/source/com/intellij/ide/projectView/impl/nodes/BasePsiNode.java
@@ -44,14 +44,12 @@ public abstract class BasePsiNode <Type extends PsiElement> extends ProjectViewN
   }
 
   public FileStatus getFileStatus() {
-    if (getParentValue() instanceof PsiDirectory) {
-      VirtualFile file = getVirtualFileForValue();
-      if (file != null) {
-        return FileStatusManager.getInstance(getProject()).getStatus(file);
-      }
+    VirtualFile file = getVirtualFileForValue();
+    if (file != null) {
+      return FileStatusManager.getInstance(getProject()).getStatus(file);
+    } else {
+      return FileStatus.NOT_CHANGED;
     }
-    return FileStatus.NOT_CHANGED;
-
   }
 
   private VirtualFile getVirtualFileForValue() {
diff --git a/testSource/com/intellij/projectView/BaseProjectViewTestCase.java b/testSource/com/intellij/projectView/BaseProjectViewTestCase.java
index 38cef2242691..a8d597f2184b 100644
--- a/testSource/com/intellij/projectView/BaseProjectViewTestCase.java
+++ b/testSource/com/intellij/projectView/BaseProjectViewTestCase.java
@@ -30,8 +30,6 @@ import java.util.Iterator;
 public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
   protected AbstractTreeStructure myStructure;
   protected boolean myShowMembers = false;
-  protected AbstractProjectViewPSIPane myPane;
-
 
   protected void setUp() throws Exception {
     super.setUp();
@@ -41,9 +39,10 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
         return myShowMembers;
       }
     };
+  }
 
-
-    myPane = new AbstractProjectViewPSIPane(myProject) {
+  protected AbstractProjectViewPSIPane createPane() {
+    final AbstractProjectViewPSIPane pane = new AbstractProjectViewPSIPane(myProject) {
       protected ProjectViewSelectInTarget createSelectInTarget() {
         return null;
       }
@@ -54,7 +53,7 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
 
       protected BaseProjectTreeBuilder createBuilder(DefaultTreeModel treeModel) {
         return new ProjectTreeBuilder(myProject, myTree, treeModel, AlphaComparator.INSTANCE,
-                                      (ProjectAbstractTreeStructureBase)myTreeStructure) {
+        (ProjectAbstractTreeStructureBase)myTreeStructure) {
           protected AbstractTreeUpdater createUpdater() {
             return createTreeUpdater(this);
           }
@@ -91,9 +90,8 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
         return null;
       }
     };
-
-    myPane.initTree();
-
+    pane.initTree();
+    return pane;
   }
 
   protected void assertStructureEqual(PsiDirectory packageDirectory, String expected) {
@@ -185,22 +183,18 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
     }
   }
 
-  protected boolean isExpanded(DefaultMutableTreeNode nodeForElement) {
+  protected boolean isExpanded(DefaultMutableTreeNode nodeForElement, AbstractProjectViewPSIPane pane) {
     TreePath path = new TreePath(nodeForElement.getPath());
-    return getTree().isExpanded(path.getParentPath());
+    return pane.getTree().isExpanded(path.getParentPath());
   }
 
-  protected DefaultMutableTreeNode getNodeForElement(PsiElement element) {
-    JTree tree = getTree();
+  protected DefaultMutableTreeNode getNodeForElement(PsiElement element, AbstractProjectViewPSIPane pane) {
+    JTree tree = pane.getTree();
     TreeModel model = tree.getModel();
     Object root = model.getRoot();
     return getNodeForElement(root, model, element);
   }
 
-  private JTree getTree() {
-    return myPane.getTree();
-  }
-
   private DefaultMutableTreeNode getNodeForElement(Object root, TreeModel model, PsiElement element) {
     if (root instanceof DefaultMutableTreeNode) {
       Object userObject = ((DefaultMutableTreeNode)root).getUserObject();
@@ -216,18 +210,18 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
     return null;
   }
 
-  protected void checkNavigateFromSourceBehaviour(PsiElement element, VirtualFile virtualFile) {
-    myPane.dispose();
-    myPane.initTree();
-    assertNull(getNodeForElement(element));
-    myPane.select(element, virtualFile, true);
-    assertTrue(isExpanded(element));
+  protected void checkNavigateFromSourceBehaviour(PsiElement element, VirtualFile virtualFile, AbstractProjectViewPSIPane pane) {
+    pane.dispose();
+    pane.initTree();
+    assertNull(getNodeForElement(element,pane));
+    pane.select(element, virtualFile, true);
+    assertTrue(isExpanded(element, pane));
   }
 
-  protected boolean isExpanded(PsiElement element) {
-    DefaultMutableTreeNode nodeForElement = getNodeForElement(element);
+  protected boolean isExpanded(PsiElement element, AbstractProjectViewPSIPane pane) {
+    DefaultMutableTreeNode nodeForElement = getNodeForElement(element, createPane());
     if (nodeForElement == null) return false;
-    return isExpanded(nodeForElement);
+    return isExpanded(nodeForElement, pane);
   }
 
   protected void assertListsEqual(DefaultListModel model, String expected) {
diff --git a/testSource/com/intellij/projectView/FormMergerTreeStructureProviderTest.java b/testSource/com/intellij/projectView/FormMergerTreeStructureProviderTest.java
index 696ebe57d89a..1aa4ed6d7038 100644
--- a/testSource/com/intellij/projectView/FormMergerTreeStructureProviderTest.java
+++ b/testSource/com/intellij/projectView/FormMergerTreeStructureProviderTest.java
@@ -3,6 +3,7 @@ package com.intellij.projectView;
 import com.intellij.ide.projectView.TreeStructureProvider;
 import com.intellij.ide.projectView.impl.ClassesTreeStructureProvider;
 import com.intellij.ide.projectView.impl.FormMergerTreeStructureProvider;
+import com.intellij.ide.projectView.impl.AbstractProjectViewPSIPane;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiFile;
@@ -12,6 +13,7 @@ import com.intellij.psi.PsiJavaFile;
 public class FormMergerTreeStructureProviderTest extends BaseProjectViewTestCase {
 
   public void testStandardProviders() {
+    final AbstractProjectViewPSIPane pane = createPane();
     getProjectTreeStructure().setProviders(new TreeStructureProvider[]{
       new ClassesTreeStructureProvider(myProject),
       new FormMergerTreeStructureProvider(myProject)
@@ -28,11 +30,11 @@ public class FormMergerTreeStructureProviderTest extends BaseProjectViewTestCase
                                                                       " PsiJavaFile:Class4.java\n");
 
     PsiClass psiClass = ((PsiJavaFile)getPackageDirectory().findFile("Form1.java")).getClasses()[0];
-    checkNavigateFromSourceBehaviour(psiClass, psiClass.getContainingFile().getVirtualFile());
+    checkNavigateFromSourceBehaviour(psiClass, psiClass.getContainingFile().getVirtualFile(), pane);
 
     PsiFile psiFile = getPackageDirectory().findFile("Form1.form");
     VirtualFile virtualFile = psiFile.getContainingFile().getVirtualFile();
-    checkNavigateFromSourceBehaviour(psiFile, virtualFile);    
+    checkNavigateFromSourceBehaviour(psiFile, virtualFile, pane);    
   }
 
 }