Merge branch 'master' of git.labs.intellij.net:idea/community

java/java-tests/testData/refactoring/renameCollisions/RenameTypeParameterToExistingClassName.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2000-2010 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class Test<T<caret> extends String> {}
+
+class P {}

java/java-tests/testData/refactoring/renameCollisions/RenameTypeParameterToExistingClassName.java.after

@@ -0,0 +1,3 @@
+public class Test<P extends String> {}
+
+class P {}