diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java b/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java index 596dbba98a5f..44a4788a0abe 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java @@ -86,7 +86,7 @@ public class AutomaticRenamingDialog extends DialogWrapper { myUsagePreviewPanel = new UsagePreviewPanel(myProject); myUsageFileLabel = new JLabel(); populateData(); - myTableModel = new MyTableModel(); + myTableModel = new MyTableModel(renamer.allowChangeSuggestedName()); setTitle(myRenamer.getDialogTitle()); init(); } @@ -300,6 +300,12 @@ public class AutomaticRenamingDialog extends DialogWrapper { } private class MyTableModel extends AbstractTableModel { + private final boolean myAllowRename; + + private MyTableModel(boolean allowRename) { + myAllowRename = allowRename; + } + @Override public int getColumnCount() { return 3; @@ -342,7 +348,7 @@ public class AutomaticRenamingDialog extends DialogWrapper { @Override public boolean isCellEditable(int rowIndex, int columnIndex) { - return columnIndex != OLD_NAME_COLUMN; + return columnIndex != OLD_NAME_COLUMN && (myAllowRename || columnIndex != NEW_NAME_COLUMN); } @Override diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java index 4a2bb0027a6b..f586257f2c8e 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java @@ -166,6 +166,10 @@ public abstract class AutomaticRenamer { return name; } + public boolean allowChangeSuggestedName() { + return true; + } + public boolean isSelectedByDefault() { return false; }