project & structure view tests to CE

java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java

@@ -265,6 +265,21 @@ public class JavaSdkImpl extends JavaSdk {
     return jdk;
   }
 
+  public static Sdk getMockJdkCE() {
+    File mockJdkCEPath = new File(PathManager.getHomePath(), "java/mockJDK");
+    if (mockJdkCEPath.exists()) {
+      return createMockJdk(mockJdkCEPath.getPath(), "java 1.5", getInstance());
+    }
+
+    mockJdkCEPath = new File(PathManager.getHomePath(), "community/java/mockJDK");
+    if (mockJdkCEPath.exists()) {
+      return createMockJdk(mockJdkCEPath.getPath(), "java 1.5", getInstance());
+    }
+
+    return getMockJdk("java 1.5");
+
+  }
+
   public static Sdk getMockJdk(@NonNls String versionName) {
     File mockJdkCEPath = new File(PathManager.getHomePath(), "java/mockJDK");
     if (mockJdkCEPath.exists()) {

java/java-tests/testData/projectView/annoyingScrolling/src/com/package1/Class1.java

@@ -0,0 +1,15 @@
+package com.package1;
+
+public class Class1 {
+  private boolean myField1;
+  public boolean myField2;
+  
+  public int getValue(){
+   return 0;
+  }
+  
+  public class InnerClass{
+    public int myInnerClassField;
+  }
+  
+}

java/java-tests/testData/projectView/fileStructureForClass/src/com/package1/Class1.java

@@ -0,0 +1,22 @@
+package com.package1;
+
+public class Class1 {
+
+  private String _myField2;
+  
+
+  class Inner2{
+
+  }
+
+  int _myField1;
+
+  class Inner1{
+
+  }
+
+  private void __method() {
+
+  }
+
+}

java/java-tests/testData/projectView/getParentObject/src/com/package1/Class1.java

@@ -0,0 +1,12 @@
+package com.package1;
+
+public class Class1 {
+
+  private String myField;
+  
+  private void method() {
+  
+  }
+  
+
+}

java/java-tests/testData/projectView/getParentObject/src/com/package1/Class2.java

@@ -0,0 +1,8 @@
+package com.package1;
+
+public class Class2 {
+}
+
+class Class3 {
+
+}

java/java-tests/testData/projectView/getParentObject/src/com/package1/Class4.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public Class4 {
+}

java/java-tests/testData/projectView/getParentObject/src/com/package1/Form1.form

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.package1.Form1"/>

java/java-tests/testData/projectView/getParentObject/src/com/package1/Form1.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public class Form1 {
+}

java/java-tests/testData/projectView/getParentObject/src/com/package1/Form2.form

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form version="1" xmlns="http://www.intellij.com/uidesigner/form/"/>

java/java-tests/testData/projectView/packageView/src/com/package1/Class1.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public class Class1 {
+}

java/java-tests/testData/projectView/packageView/src/com/package1/Class2.java

@@ -0,0 +1,8 @@
+package com.package1;
+
+public class Class2 {
+}
+
+class Class3 {
+
+}

java/java-tests/testData/projectView/packageView/src/com/package1/Class4.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public Class4 {
+}

java/java-tests/testData/projectView/packageView/src/com/package1/Form1.form

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.package1.Form1"/>

java/java-tests/testData/projectView/packageView/src/com/package1/Form1.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public class Form1 {
+}

java/java-tests/testData/projectView/packageView/src/com/package1/Form2.form

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form version="1" xmlns="http://www.intellij.com/uidesigner/form/"/>

java/java-tests/testData/projectView/packageView/src/java/Class1.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public class Class1 {
+}

java/java-tests/testData/projectView/packageView/src/javax/servlet/Class1.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public class Class1 {
+}

java/java-tests/testData/projectView/selectProject/src/com/package1/Class1.java

@@ -0,0 +1,12 @@
+package com.package1;
+
+public class Class1 {
+
+  private String myField;
+  
+  private void method() {
+  
+  }
+  
+
+}

java/java-tests/testData/projectView/selectProject/src/com/package1/Class2.java

@@ -0,0 +1,8 @@
+package com.package1;
+
+public class Class2 {
+}
+
+class Class3 {
+
+}

java/java-tests/testData/projectView/selectProject/src/com/package1/Class4.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public Class4 {
+}

java/java-tests/testData/projectView/selectProject/src/com/package1/Form1.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public class Form1 {
+}

java/java-tests/testData/projectView/showClassMembers/src/com/package1/Class1.java

@@ -0,0 +1,15 @@
+package com.package1;
+
+public class Class1 {
+  private boolean myField1;
+  public boolean myField2;
+  
+  public int getValue(){
+   return 0;
+  }
+  
+  public class InnerClass{
+    public int myInnerClassField;
+  }
+  
+}

java/java-tests/testData/projectView/showClassMembers/src/com/package1/Class2.java

@@ -0,0 +1,53 @@
+package com.package1;
+
+public class Class2 {
+  private boolean myField1;
+  public boolean myField2;
+  public boolean myField3;
+  public boolean myField4;
+
+  public int getValue() {
+    return 0;
+  }
+
+  public class InnerClass1 {
+    public int myInnerClassField;
+
+    public class InnerClass12 {
+      public int myInnerClassField;
+
+      public class InnerClass13 {
+        public int myInnerClassField;
+
+        public class InnerClass14 {
+          public int myInnerClassField;
+
+          public class InnerClass15 {
+            public int myInnerClassField;
+          }
+        }
+      }
+    }
+  }
+
+  public class InnerClass2 {
+    public int myInnerClassField;
+
+    public class InnerClass22 {
+      public int myInnerClassField;
+
+      public class InnerClass23 {
+        public int myInnerClassField;
+
+        public class InnerClass24 {
+          public int myFieldToSelect;
+
+          public class InnerClass25 {
+            public int myInnerClassField;
+          }
+        }
+      }
+    }
+  }
+
+}

java/java-tests/testData/projectView/standardProviders/src/com/package1/Class1.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public class Class1 {
+}

java/java-tests/testData/projectView/standardProviders/src/com/package1/Class2.java

@@ -0,0 +1,8 @@
+package com.package1;
+
+public class Class2 {
+}
+
+class Class3 {
+
+}

java/java-tests/testData/projectView/standardProviders/src/com/package1/Class4.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public Class4 {
+}

java/java-tests/testData/projectView/standardProviders/src/com/package1/Form1.form

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.package1.Form1"/>

java/java-tests/testData/projectView/standardProviders/src/com/package1/Form1.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public class Form1 {
+}

java/java-tests/testData/projectView/standardProviders/src/com/package1/Form2.form

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form version="1" xmlns="http://www.intellij.com/uidesigner/form/"/>

java/java-tests/testData/projectView/toDo/src/package1/JavaClass.java

@@ -0,0 +1,11 @@
+package src.package1;
+
+public class JavaClass {
+
+ //todo: Class body
+  protected Object clone() throws CloneNotSupportedException {
+//todo: Method body
+    return super.clone();
+  }
+
+}

java/java-tests/testData/projectView/toDo/src/package1/package2/JavaClass.java

@@ -0,0 +1,11 @@
+package src.package1.package2;
+
+public class JavaClass {
+
+  //todo: Class body
+   protected Object clone() throws CloneNotSupportedException {
+//todo: Method body
+     return super.clone();
+   }
+
+}

java/java-tests/testData/projectView/toDo/src/package3/JavaClass.java

@@ -0,0 +1,11 @@
+package src.package3;
+
+public class JavaClass {
+
+  //todo: Class body
+   protected Object clone() throws CloneNotSupportedException {
+//todo: Method body
+     return super.clone();
+   }
+
+}

java/java-tests/testData/projectView/toDo/xmlFile.xml

@@ -0,0 +1,3 @@
+<tag>
+  <!--todo-->
+</tag>

java/java-tests/testData/projectView/toDo1/src/package1/package2/JavaClass.java

@@ -0,0 +1,11 @@
+package src.package1.package2;
+
+public class JavaClass {
+
+  //todo: Class body
+   protected Object clone() throws CloneNotSupportedException {
+//todo: Method body
+     return super.clone();
+   }
+
+}

java/java-tests/testData/projectView/updateProjectView/src/com/package1/Class1.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public class Class1 {
+}

java/java-tests/testData/projectView/updateProjectView/src/com/package1/Class2.java

@@ -0,0 +1,8 @@
+package com.package1;
+
+public class Class2 {
+}
+
+class Class3 {
+
+}

java/java-tests/testData/projectView/updateProjectView/src/com/package1/Class4.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public Class4 {
+}

java/java-tests/testData/projectView/updateProjectView/src/com/package1/Form1.form

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.package1.Form1"/>

java/java-tests/testData/projectView/updateProjectView/src/com/package1/Form1.java

@@ -0,0 +1,4 @@
+package com.package1;
+
+public class Form1 {
+}

java/java-tests/testData/projectView/updateProjectView/src/com/package1/Form2.form

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form version="1" xmlns="http://www.intellij.com/uidesigner/form/"/>

java/java-tests/testData/projectView/xmlStructureView/file1.dtd

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!ELEMENT myplugin (helpset)>
+<!ATTLIST myplugin
+    url CDATA #IMPLIED
+    version CDATA #IMPLIED>
+<!ELEMENT helpset EMPTY>
+<!ATTLIST helpset
+  file CDATA #REQUIRED
+  path CDATA #REQUIRED>
+
+<!ENTITY % draft 'IGNORE'>
+ <!ENTITY % final 'INCLUDE'>
+
+<![%draft;[
+<!ELEMENT book (comments*, title, body, supplements?)>
+<!ELEMENT comments EMPTY>
+]]>
+<![%final;[
+<!ELEMENT book (price,title, body, supplements?)>
+<!ELEMENT price EMPTY>
+]]>

java/java-tests/testData/projectView/xmlStructureView/file1.html

@@ -0,0 +1,11 @@
+<HEAD>
+<TITLE>CSS Example</TITLE>
+<STYLE TYPE="text/css">
+  H1 { font-size: x-large; color: red }
+  H2 { font-size: large; color: blue }
+</STYLE>
+<BODY>
+  <P>text
+  <BR>text2
+</BODY>
+</HEAD>

java/java-tests/testData/projectView/xmlStructureView/file1.xml

@@ -0,0 +1,11 @@
+<root name="IDEA_ZKM" default="all_dist" basedir=".">
+  <a attr1="value1" attr2="value2">
+    text
+    <a attr1="value1" attr2="value2">
+      text2
+    <text><![CDATA[Text with
+a new line]]></text>      
+      <b/>
+    </a>
+  </a>
+</root>

java/java-tests/testData/projectView/xmlStructureView/file2.dtd

@@ -0,0 +1,4 @@
+<!ENTITY % HTMLlat1 PUBLIC
+  "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+  "xhtml-lat1-modified.ent">
+%HTMLlat1;

java/java-tests/testData/projectView/xmlStructureView/file2.xml

@@ -0,0 +1,8 @@
+<!DOCTYPE title 
+  [
+<!ELEMENT title (#PCDATA | body)* >
+<!ELEMENT body EMPTY>
+<!ELEMENT supplements EMPTY>
+  ]>
+
+<title/>

java/java-tests/testData/projectView/xmlStructureView/xhtml-lat1-modified.ent

@@ -0,0 +1,2 @@
+<!ENTITY nbsp   "&#160;"> <!-- no-break space = non-breaking space,
+                                  U+00A0 ISOnum -->

java/java-tests/testData/structureView/expandElementWithExitingName/test.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<test>
+	<level1>
+		<level2>
+			<level3></level3>
+		</level2>
+	</level1>
+	<level1>
+		<level2>
+			<level3></level3>
+		</level2>
+	</level1>
+	<level1>
+		<level2>
+			<level3></level3>
+		</level2>
+	</level1>
+	<level1>
+		<level2>
+			<level3></level3>
+		</level2>
+	</level1>
+</test>

java/java-tests/testData/structureView/javaClassStructure/src/com/package1/Class1.java

@@ -0,0 +1,10 @@
+package com.package1;
+
+public class Class1 {
+  public boolean myField1;
+  public boolean myField2;
+  
+  public int getValue(){
+   return 0;
+  }  
+}

java/java-tests/testData/structureView/membersOrder/src/com/package1/Class2.java

@@ -0,0 +1,7 @@
+public class Class2 {
+  private int ab;
+  protected int z;
+  public void af(){}
+  public void zf(){}
+  public Class2(){}
+}

java/java-tests/testData/structureView/showClassMembers/src/com/package1/Class2.java

@@ -0,0 +1,53 @@
+package com.package1;
+
+public class Class2 {
+  private boolean myField1;
+  public boolean myField2;
+  public boolean myField3;
+  public boolean myField4;
+
+  public int getValue() {
+    return 0;
+  }
+
+  public class InnerClass1 {
+    public int myInnerClassField;
+
+    public class InnerClass12 {
+      public int myInnerClassField;
+
+      public class InnerClass13 {
+        public int myInnerClassField;
+
+        public class InnerClass14 {
+          public int myInnerClassField;
+
+          public class InnerClass15 {
+            public int myInnerClassField;
+          }
+        }
+      }
+    }
+  }
+
+  public class InnerClass2 {
+    public int myInnerClassField;
+
+    public class InnerClass22 {
+      public int myInnerClassField;
+
+      public class InnerClass23 {
+        public int myInnerClassField;
+
+        public class InnerClass24 {
+          public int myFieldToSelect;
+
+          public class InnerClass25 {
+            public int myInnerClassField;
+          }
+        }
+      }
+    }
+  }
+
+}

java/java-tests/testData/structureView/visibilitySorter/src/com/package1/Class2.java

@@ -0,0 +1,5 @@
+public class Class2 {
+  private int __myPrivateFiield;
+  protected int _myProtectedField;
+  public int myPublicField;
+}

java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java

@@ -15,6 +15,7 @@
  */
 package com.intellij.projectView;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.ide.SelectInTarget;
 import com.intellij.ide.projectView.BaseProjectTreeBuilder;
 import com.intellij.ide.projectView.ProjectView;
@@ -23,6 +24,8 @@ import com.intellij.ide.projectView.impl.*;
 import com.intellij.ide.projectView.impl.nodes.PackageElementNode;
 import com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode;
 import com.intellij.ide.util.treeView.*;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 import com.intellij.openapi.ui.Queryable;
 import com.intellij.testFramework.IdeaTestUtil;
 import com.intellij.openapi.project.DumbAwareRunnable;
@@ -276,4 +279,14 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
 
     }
   }
+
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
+  @Override
+  protected Sdk getTestProjectJdk() {
+    return JavaSdkImpl.getMockJdkCE();
+  }
 }

java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java

@@ -31,10 +31,13 @@
  */
 package com.intellij.projectView;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.ide.structureView.impl.java.InheritedMembersFilter;
 import com.intellij.ide.structureView.impl.java.PublicElementsFilter;
 import com.intellij.ide.structureView.impl.java.VisibilitySorter;
 import com.intellij.ide.structureView.newStructureView.StructureViewComponent;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 import com.intellij.testFramework.IdeaTestUtil;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -54,20 +57,21 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
   public void testJavaClassStructure() throws Exception {
     dotest(new CheckAction() {
       public void testClassStructure(StructureViewComponent structureViewComponent) {
-        IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class1.java\n" +
+        IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(),
+                                                                 "-Class1.java\n" +
                                                                  " -Class1\n" +
                                                                  "  getValue():int\n" +
+                                                                 "  getClass():Class<? extends Object>\n" +
                                                                  "  hashCode():int\n" +
-                                                                 "  finalize():void\n" +
+                                                                 "  equals(Object):boolean\n" +
+                                                                 "  clone():Object\n" +
+                                                                 "  toString():String\n" +
                                                                  "  notify():void\n" +
                                                                  "  notifyAll():void\n" +
-                                                                 "  wait():void\n" +
                                                                  "  wait(long):void\n" +
                                                                  "  wait(long, int):void\n" +
-                                                                 "  getClass():Class\n" +
-                                                                 "  clone():Object\n" +
-                                                                 "  equals(Object):boolean\n" +
-                                                                 "  toString():String\n" +
+                                                                 "  wait():void\n" +
+                                                                 "  finalize():void\n" +
                                                                  "  myField1:boolean\n" +
                                                                  "  myField2:boolean\n");
 
@@ -110,17 +114,17 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
                                            "  +InnerClass1\n" +
                                            "  +InnerClass2\n" +
                                            "  getValue():int\n" +
+                                           "  getClass():Class<? extends Object>\n" +
                                            "  hashCode():int\n" +
-                                           "  finalize():void\n" +
+                                           "  equals(Object):boolean\n" +
+                                           "  clone():Object\n" +
+                                           "  toString():String\n" +
                                            "  notify():void\n" +
                                            "  notifyAll():void\n" +
-                                           "  wait():void\n" +
                                            "  wait(long):void\n" +
                                            "  wait(long, int):void\n" +
-                                           "  getClass():Class\n" +
-                                           "  clone():Object\n" +
-                                           "  equals(Object):boolean\n" +
-                                           "  toString():String\n" +
+                                           "  wait():void\n" +
+                                           "  finalize():void\n" +
                                            "  myField1:boolean\n" +
                                            "  myField2:boolean\n" +
                                            "  myField3:boolean\n" +
@@ -201,4 +205,14 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
     }
   }
 
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
+  @Override
+  protected Sdk getTestProjectJdk() {
+    return JavaSdkImpl.getMockJdkCE();
+  }
+
 }

java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java

@@ -35,21 +35,21 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase {
                                                 " Class4.java\n");
     assertStructureEqual("Project\n" +
            " External Libraries\n" +
-           "  Library: < java 1.4 >\n" +
-           "   jsp-api.jar\n" +
+           "  Library: < java 1.5 >\n" +
+           "   annotations.jar\n" +
+           "    classpath.index\n" +
            "    META-INF\n" +
            "     MANIFEST.MF\n" +
-           "    javax\n" +
-           "     servlet\n" +
-           "      jsp\n" +
-           "       ErrorData\n" +
-           "       HttpJspPage\n" +
-           "       JspContext\n" +
-           "       JspEngineInfo\n" +
-           "       JspException\n" +
-           "       JspFactory\n" +
-           "       JspPage\n" +
-           "       JspTagException\n"
+           "    org\n" +
+           "     intellij\n" +
+           "      lang\n" +
+           "       annotations\n" +
+           "        Identifier\n" +
+           "        Language\n" +
+           "        Pattern\n" +
+           "        PrintFormat\n" +
+           "        PrintFormatPattern\n" +
+           "        RegExp\n"
     );
 
     getProjectTreeStructure().setProviders();
@@ -65,21 +65,22 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase {
 
     assertStructureEqual("Project\n" +
            " External Libraries\n" +
-           "  Library: < java 1.4 >\n" +
-           "   jsp-api.jar\n" +
+           "  Library: < java 1.5 >\n" +
+           "   annotations.jar\n" +
+           "    classpath.index\n" +
            "    META-INF\n" +
            "     MANIFEST.MF\n" +
-           "    javax\n" +
-           "     servlet\n" +
-           "      jsp\n" +
-           "       el\n" +
-           "        ELException.class\n" +
-           "        ELParseException.class\n" +
-           "        Expression.class\n" +
-           "        ExpressionEvaluator.class\n" +
-           "        FunctionMapper.class\n" +
-           "        VariableResolver.class\n" +
-           "       resources\n");
+           "    org\n" +
+           "     intellij\n" +
+           "      lang\n" +
+           "       annotations\n" +
+           "        Identifier.class\n" +
+           "        Language.class\n" +
+           "        Pattern.class\n" +
+           "        PrintFormat.class\n" +
+           "        PrintFormatPattern.class\n" +
+           "        RegExp.class\n"
+);
   }
 
   public void testShowClassMembers() {

java/java-tests/testSrc/com/intellij/projectView/ProjectViewSwitchingTest.java

@@ -1,11 +1,14 @@
 package com.intellij.projectView;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.ide.favoritesTreeView.FavoritesManager;
 import com.intellij.ide.favoritesTreeView.FavoritesProjectViewPane;
 import com.intellij.ide.projectView.ProjectView;
 import com.intellij.ide.projectView.impl.AbstractProjectViewPane;
 import com.intellij.ide.projectView.impl.ProjectViewImpl;
 import com.intellij.ide.projectView.impl.ProjectViewPane;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 import com.intellij.testFramework.TestSourceBasedTestCase;
 
 public class ProjectViewSwitchingTest extends TestSourceBasedTestCase {
@@ -53,4 +56,15 @@ public class ProjectViewSwitchingTest extends TestSourceBasedTestCase {
     assertEquals(FavoritesProjectViewPane.ID, currentPane.getId());
     assertEquals("yyyy", currentPane.getSubId());
   }
+
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
+  @Override
+  protected Sdk getTestProjectJdk() {
+    return JavaSdkImpl.getMockJdkCE();
+  }
+
 }

java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java

@@ -31,8 +31,11 @@
  */
 package com.intellij.projectView;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.ide.structureView.impl.java.InheritedMembersFilter;
 import com.intellij.ide.structureView.newStructureView.StructureViewComponent;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 import com.intellij.testFramework.IdeaTestUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
@@ -65,13 +68,23 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase {
       final StructureViewComponent structureViewComponent =
         (StructureViewComponent)fileEditor.getStructureViewBuilder().createStructureView(fileEditor, myProject);
       final Document document = PsiDocumentManager.getInstance(myProject).getDocument(psiClass.getContainingFile());
-      IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class1.java\n" + " -Class1\n" + "  getValue():int\n" +
-                                                                     "  hashCode():int\n" + "  finalize():void\n" + "  notify():void\n" +
-                                                                     "  notifyAll():void\n" + "  wait():void\n" + "  wait(long):void\n" +
-                                                                     "  wait(long, int):void\n" + "  getClass():Class\n" +
-                                                                     "  clone():Object\n" + "  equals(Object):boolean\n" +
-                                                                     "  toString():String\n" + "  myField1:boolean\n" +
-                                                                     "  myField2:boolean\n");
+      IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(),
+                                   "-Class1.java\n" +
+                                   " -Class1\n" +
+                                   "  getValue():int\n" +
+                                   "  getClass():Class<? extends Object>\n" +
+                                   "  hashCode():int\n" +
+                                   "  equals(Object):boolean\n" +
+                                   "  clone():Object\n" +
+                                   "  toString():String\n" +
+                                   "  notify():void\n" +
+                                   "  notifyAll():void\n" +
+                                   "  wait(long):void\n" +
+                                   "  wait(long, int):void\n" +
+                                   "  wait():void\n" +
+                                   "  finalize():void\n" +
+                                   "  myField1:boolean\n" +
+                                   "  myField2:boolean\n");
 
       CommandProcessor.getInstance().executeCommand(myProject, new Runnable() {
         public void run() {
@@ -89,17 +102,17 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase {
 
       IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class1.java\n" +
                                                                      " -Class1\n" + "  getValue():int\n" +
+                                                                     "  getClass():Class<? extends Object>\n" +
                                                                      "  hashCode():int\n" +
-                                                                     "  finalize():void\n" +
+                                                                     "  equals(Object):boolean\n" +
+                                                                     "  clone():Object\n" +
+                                                                     "  toString():String\n" +
                                                                      "  notify():void\n" +
                                                                      "  notifyAll():void\n" +
-                                                                     "  wait():void\n" +
                                                                      "  wait(long):void\n" +
                                                                      "  wait(long, int):void\n" +
-                                                                     "  getClass():Class\n" +
-                                                                     "  clone():Object\n" +
-                                                                     "  equals(Object):boolean\n" +
-                                                                     "  toString():String\n" +
+                                                                     "  wait():void\n" +
+                                                                     "  finalize():void\n" +
                                                                      "  myField1:boolean\n" +
                                                                      "  myField2:boolean\n" +
                                                                      "  myNewField:boolean = false\n");
@@ -224,4 +237,15 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase {
     }
 
   }
+
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
+  @Override
+  protected Sdk getTestProjectJdk() {
+    return JavaSdkImpl.getMockJdkCE();
+  }
+
 }

platform/lang-impl/src/com/intellij/psi/impl/file/PsiBinaryFileImpl.java

@@ -19,6 +19,7 @@ package com.intellij.psi.impl.file;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.ui.Queryable;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
@@ -34,8 +35,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
+import java.util.Map;
 
-public class PsiBinaryFileImpl extends PsiElementBase implements PsiBinaryFile, Cloneable {
+public class PsiBinaryFileImpl extends PsiElementBase implements PsiBinaryFile, Cloneable, Queryable {
   private final PsiManagerImpl myManager;
   private String myName; // for myFile == null only
   private byte[] myContents; // for myFile == null only
@@ -263,4 +265,9 @@ public class PsiBinaryFileImpl extends PsiElementBase implements PsiBinaryFile,
   public PsiElement getContext() {
     return FileContextUtil.getFileContext(this);
   }
+
+  public void putInfo(Map<String, String> info) {
+    info.put("fileName", getName());
+    info.put("fileType", getFileType().getName());
+  }
 }

plugins/ui-designer/ui-designer.iml

@@ -25,6 +25,7 @@
     <orderEntry type="module" module-name="idea-ui" />
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="module" module-name="java-impl" />
+    <orderEntry type="module" module-name="java-tests" />
   </component>
   <component name="copyright">
     <Base>