From d1bde2e7e57eaace4da294cdffef0b3fde85eff2 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 20 Feb 2012 11:55:33 +0400 Subject: [PATCH 1/2] do not strip documents during shutdown --- .../com/intellij/openapi/application/impl/ApplicationImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java index b88935f46efc..b3f56b46d224 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java +++ b/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() { From 4a999d8fa2175a65849419b5265c798cb3bbac5d Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 21 Feb 2012 10:37:22 +0100 Subject: [PATCH 2/2] do not warn about default deprecated constructor for anonymous classes which use non-deprecated constructors --- .../codeInspection/deprecation/DeprecationInspection.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java b/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java index 6b5c2de96781..4387f86e35e0 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java +++ b/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();