MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 10:07:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

extracted method for comparing nullable strings

Browse Source
This commit is contained in:
nik
2011-01-18 15:40:35 +03:00
parent 2531b6616d
commit 73e467cbdb
4 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticUsageRenamer.java
+2 -8
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.refactoring.rename.naming;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.usages.RenameableUsage;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
@@ -37,15 +38,8 @@ public abstract class AutomaticUsageRenamer<T> {
myNewName = newName;
List<T> elements = new ArrayList<T>(renamedElements);
Collections.sort(elements, new Comparator<T>() {
private int compareNullable(@Nullable String s1, @Nullable String s2) {
if (s1 != null) {
return s2 == null ? 1 : s1.compareTo(s2);
}
return s2 == null ? 0 : -1;
}
public int compare(T o1, T o2) {
int i = compareNullable(getSourceName(o1), getSourceName(o2));
int i = StringUtil.compare(getSourceName(o1), getSourceName(o2), false);
if (i != 0) return i;
return getName(o1).compareTo(getName(o2));
}