From 487182f8ded30b0bc6f77fd0102a7c2a4671a6b4 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Tue, 2 Jul 2013 15:50:44 +0400 Subject: [PATCH] cleanup --- .../rename/PropertyRenameHandler.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/PropertyRenameHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/PropertyRenameHandler.java index dc9635b4d1e1..553f12101b3f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/PropertyRenameHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/PropertyRenameHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 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. @@ -77,13 +77,19 @@ public class PropertyRenameHandler implements RenameHandler, TitledHandler { final Pair, String> pair = askToRenameProperty((PsiMember)element); final List result = pair.getFirst(); if (result.size() == 0) return; - if (result.size() == 1) { - PsiElementRenameHandler.invoke(result.get(0), project, result.get(0), editor); - return; - } - final String propertyName = pair.getSecond(); - PsiElementRenameHandler.invoke(new PropertyForRename(result, propertyName, element.getManager()), project, element, editor); + PsiElement propertyToRename = getPropertyToRename(element, result, pair.getSecond()); + + PsiElementRenameHandler.invoke(propertyToRename, project, element, editor); + } + + private static PsiElement getPropertyToRename(PsiElement element, List result, String propertyName) { + if (result.size() == 1) { + return result.get(0); + } + else /*if (result.size() > 1)*/ { + return new PropertyForRename(result, propertyName, element.getManager()); + } } @Override