Merge remote-tracking branch 'origin/master'

platform/platform-resources-en/src/messages/RefactoringBundle.properties

@@ -139,6 +139,8 @@ introduce.variable.title=Extract Variable
 refactoring.introduce.context.error=Cannot perform refactoring in this context
 refactoring.introduceVariable=Extract Variable refactoring
 refactoring.introduce.selection.error=Cannot perform refactoring using selected element(s)
+refactoring.introduce.name.error=Incorrect name
+refactoring.introduce.name.used.error=This name is already used
 
 variable.of.type=Variable of &type:
 convert.to.instance.method.title=Convert To Instance Method

platform/util/src/com/intellij/util/concurrency/JBReentrantReadWriteLock.java

@@ -19,6 +19,9 @@
  */
 package com.intellij.util.concurrency;
 
+/**
+ * @see LockFactory
+ */
 public interface JBReentrantReadWriteLock {
   JBLock readLock();
   JBLock writeLock();