From 05511bd329655f79cf373dd66b8184115d225123 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Fri, 1 Jul 2011 18:16:20 +0400 Subject: [PATCH] cleanup --- .../changeSignature/JavaChangeSignatureHandler.java | 7 ++----- .../platform-resources-en/src/misc/registry.properties | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java index afbffdbb4476..4b6070591a6c 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.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. @@ -24,7 +24,6 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ScrollType; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.util.registry.Registry; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.HelpID; @@ -86,9 +85,7 @@ public class JavaChangeSignatureHandler implements ChangeSignatureHandler { final PsiClass containingClass = method.getContainingClass(); final PsiReferenceExpression refExpr = editor != null ? TargetElementUtil.findReferenceExpression(editor) : null; final boolean allowDelegation = containingClass != null && !containingClass.isInterface(); - final DialogWrapper dialog = Registry.is("new.change.signature.dialog") - ? new NewJavaChangeSignatureDialog(project, method, allowDelegation, refExpr) - : new JavaChangeSignatureDialog(project, method, allowDelegation, refExpr); + final DialogWrapper dialog = new JavaChangeSignatureDialog(project, method, allowDelegation, refExpr); dialog.show(); } diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties index dbd233ef8674..062122c52832 100644 --- a/platform/platform-resources-en/src/misc/registry.properties +++ b/platform/platform-resources-en/src/misc/registry.properties @@ -136,4 +136,3 @@ dir.diff.default.trg.folder= show.live.templates.in.completion=false documentation.component.editor.font=false ide.mac.useNativeClipboard=true -new.change.signature.dialog=false