Code cleanup.
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/paths/ProjectVariable.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/paths/ProjectVariable.java
index 269b4d1..1ec0657 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/paths/ProjectVariable.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/paths/ProjectVariable.java
@@ -21,17 +21,17 @@
private static final String VARIABLE_VALUE = "${project}";
static IPath useProjectVariable(IPath path, IProject project) {
- return switchProjectNames(path, project.getName(), VARIABLE_VALUE);
+ return switchProjectSegments(path, project.getName(), VARIABLE_VALUE);
}
static String useProjectName(String path, IProject project) {
- IPath newPath = switchProjectNames(new Path(path), VARIABLE_VALUE, project.getName());
+ IPath newPath = switchProjectSegments(new Path(path), VARIABLE_VALUE, project.getName());
return newPath.toString();
}
- private static IPath switchProjectNames(IPath path, String originalName, String newName) {
- if (!originalName.equals(path.segment(0))) return path;
- IPath newPath = new Path(newName);
+ private static IPath switchProjectSegments(IPath path, String currentSegment, String newSegment) {
+ if (!currentSegment.equals(path.segment(0))) return path;
+ IPath newPath = new Path(newSegment);
newPath = newPath.append(path.removeFirstSegments(1));
if (path.isAbsolute()) newPath = newPath.makeAbsolute();
return newPath;
