From 2e427c84f6932453eb23c92a4f4bc826e19be833 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Mon, 18 Nov 2013 12:22:06 +0100 Subject: [PATCH] wording --- .../com/intellij/refactoring/InplaceIntroduceParameterTest.java | 2 +- .../src/messages/RefactoringBundle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceParameterTest.java b/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceParameterTest.java index 5be5dad1c1a1..697b42314e3e 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceParameterTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceParameterTest.java @@ -122,7 +122,7 @@ public class InplaceIntroduceParameterTest extends AbstractJavaInplaceIntroduceT }); } catch (BaseRefactoringProcessor.ConflictsInTestsException e) { - assertEquals("There is already a parameter p. It will conflict with an introduced parameter", e.getMessage()); + assertEquals("There is already a parameter p. It will conflict with the introduced parameter", e.getMessage()); return; } fail("Conflict expected"); diff --git a/platform/platform-resources-en/src/messages/RefactoringBundle.properties b/platform/platform-resources-en/src/messages/RefactoringBundle.properties index 592d20c9ed9e..e4350745f34c 100644 --- a/platform/platform-resources-en/src/messages/RefactoringBundle.properties +++ b/platform/platform-resources-en/src/messages/RefactoringBundle.properties @@ -299,7 +299,7 @@ add.parameters.for.fields.to.constructors=Add parameters for &fields to construc 0.already.contains.inner.class.named.1={0} already contains inner class named {1} 0.uses.1.which.is.pushed.down={0} uses {1}, which is pushed down refactoring.cannot.be.performed=Refactoring cannot be performed -there.is.already.a.0.it.will.conflict.with.an.introduced.parameter=There is already a {0}. It will conflict with an introduced parameter +there.is.already.a.0.it.will.conflict.with.an.introduced.parameter=There is already a {0}. It will conflict with the introduced parameter introduce.parameter.command=Extracting parameter to {0} parameter.initializer.contains.0.but.not.all.calls.to.method.are.in.its.class=Parameter initializer contains {0}, but not all calls to method are in its class 0.is.not.accessible.from.1.value.for.introduced.parameter.in.that.method.call.will.be.incorrect={0} is not accessible from {1}. Value for introduced parameter in that method call will be incorrect.