Move two methods on the spot they were prior to the last commit; remove...

Move two methods on the spot they were prior to the last commit; remove optional final modifier of BestMappingSelector#get() method.

platform/util/src/com/intellij/util/PathMappingSettings.java

@@ -73,21 +73,6 @@ public class PathMappingSettings extends AbstractPathMapper implements Cloneable
     return norm(path);
   }
 
-  @NotNull
-  public static String mapToLocal(String path, String remoteRoot, String localRoot) {
-    if (areBothEmpty(localRoot, remoteRoot)) {
-      return path;
-    }
-    path = norm(path);
-    String remotePrefix = norm(remoteRoot);
-    path = path.replace(remotePrefix, norm(localRoot));
-    return path;
-  }
-
-  public static boolean areBothEmpty(String localRoot, String remoteRoot) {
-    return StringUtil.isEmpty(localRoot) || StringUtil.isEmpty(remoteRoot);
-  }
-
   @Override
   public boolean isEmpty() {
     return myPathMappings.isEmpty();
@@ -105,7 +90,7 @@ public class PathMappingSettings extends AbstractPathMapper implements Cloneable
     }
 
     @Nullable
-    public final PathMapping get() {
+    public PathMapping get() {
       return myBest;
     }
   }
@@ -167,6 +152,21 @@ public class PathMappingSettings extends AbstractPathMapper implements Cloneable
     myPathMappings = create(pathMappings);
   }
 
+  @NotNull
+  public static String mapToLocal(String path, String remoteRoot, String localRoot) {
+    if (areBothEmpty(localRoot, remoteRoot)) {
+      return path;
+    }
+    path = norm(path);
+    String remotePrefix = norm(remoteRoot);
+    path = path.replace(remotePrefix, norm(localRoot));
+    return path;
+  }
+
+  public static boolean areBothEmpty(String localRoot, String remoteRoot) {
+    return StringUtil.isEmpty(localRoot) || StringUtil.isEmpty(remoteRoot);
+  }
+
   @Nullable
   public static PathMappingSettings readExternal(@Nullable final Element element) {
     if (element == null) {