Merge remote-tracking branch 'origin/master'

java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -150,6 +150,10 @@ public class DeprecationInspection extends BaseJavaLocalInspectionTool {
       assert containingClass != null;
       final PsiClass superClass = containingClass.getSuperClass();
       if (hasDefaultDeprecatedConstructor(superClass)) {
+        if (superClass instanceof PsiAnonymousClass) {
+          final PsiExpressionList argumentList = ((PsiAnonymousClass)superClass).getArgumentList();
+          if (argumentList != null && argumentList.getExpressions().length > 0) return;
+        }
         final PsiCodeBlock body = method.getBody();
         if (body != null) {
           final PsiStatement[] statements = body.getStatements();

platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java

@@ -1309,7 +1309,7 @@ public class ApplicationImpl extends ComponentManagerImpl implements Application
   }
 
   public boolean isDisposeInProgress() {
-    return myDisposeInProgress;
+    return myDisposeInProgress || ShutDownTracker.isShutdownHookRunning();
   }
 
   public boolean isRestartCapable() {