From 655c371db7a8d78aa577be9fa3f028867d2be155 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 24 Jun 2011 12:39:10 +0400
Subject: [PATCH] EA-28491 (more logging)

---
 .../com/intellij/psi/JavaStubBuilderTest.java     |  9 +++++----
 .../com/intellij/psi/stubs/LightStubBuilder.java  | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java b/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java
index 1f9a689f212d..45a08cbf7b46 100644
--- a/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2011 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,19 +21,20 @@ import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.impl.DebugUtil;
-import com.intellij.psi.impl.source.JavaFileStubBuilder;
 import com.intellij.psi.impl.source.JavaLightStubBuilder;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.testFramework.LightIdeaTestCase;
 import com.intellij.testFramework.PlatformTestUtil;
 import com.intellij.util.ThrowableRunnable;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.security.SecureRandom;
 
 
 public class JavaStubBuilderTest extends LightIdeaTestCase {
-  private static final StubBuilder OLD_BUILDER = new JavaFileStubBuilder();
+  @SuppressWarnings("deprecation")
+  private static final StubBuilder OLD_BUILDER = new com.intellij.psi.impl.source.JavaFileStubBuilder();
   private static final StubBuilder NEW_BUILDER = new JavaLightStubBuilder();
   private static final int SOE_TEST_DEPTH = 20000;
 
@@ -364,7 +365,7 @@ public class JavaStubBuilderTest extends LightIdeaTestCase {
     }).cpuBound().assertTiming();
   }
 
-  private static void doTest(final String source, final String tree) {
+  private static void doTest(final String source, @Nullable final String tree) {
     final PsiJavaFile file = (PsiJavaFile)createLightFile("test.java", source);
     final FileASTNode fileNode = file.getNode();
     assertNotNull(fileNode);
diff --git a/platform/lang-api/src/com/intellij/psi/stubs/LightStubBuilder.java b/platform/lang-api/src/com/intellij/psi/stubs/LightStubBuilder.java
index 89d0b0356e40..85bf4e34627a 100644
--- a/platform/lang-api/src/com/intellij/psi/stubs/LightStubBuilder.java
+++ b/platform/lang-api/src/com/intellij/psi/stubs/LightStubBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2011 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package com.intellij.psi.stubs;
 
 import com.intellij.lang.*;
+import com.intellij.openapi.diagnostic.LogUtil;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.LanguageFileType;
@@ -139,7 +140,7 @@ public class LightStubBuilder implements StubBuilder {
         }
       }
       else {
-        LOG.error("Element is not of ILighterStubElementType: " + elementType + ", " + element);
+        LOG.error("Element is not of ILightStubElementType: " + LogUtil.objectAndClass(elementType) + ", " + element);
       }
     }
 
@@ -259,6 +260,11 @@ public class LightStubBuilder implements StubBuilder {
       public int hashCode() {
         return myNode.hashCode();
       }
+
+      @Override
+      public String toString() {
+        return "node wrapper[" + myNode + "]";
+      }
     }
 
     private static class TokenNodeWrapper extends NodeWrapper implements LighterASTTokenNode {
@@ -270,6 +276,11 @@ public class LightStubBuilder implements StubBuilder {
       public CharSequence getText() {
         return myNode.getText();
       }
+
+      @Override
+      public String toString() {
+        return "token wrapper[" + myNode + "]";
+      }
     }
   }
 }
\ No newline at end of file