changed variable names to be more descriptive

Author: pmbittner

src/main/java/de/variantsync/evolution/variability/pc/Artefact.java

@@ -68,14 +68,14 @@ default String prettyPrint() {
         return new PrettyPrinter().prettyPrint(this);
     }
 
-    default Result<Node, Exception> getPresenceConditionOf(final CaseSensitivePath path, final int lineNumber) {
-        final LinePCQuery query = new LinePCQuery(path, lineNumber);
+    default Result<Node, Exception> getPresenceConditionOf(final CaseSensitivePath relativePath, final int lineNumber) {
+        final LinePCQuery query = new LinePCQuery(relativePath, lineNumber);
         accept(query);
         return query.getResult();
     }
 
-    default Result<Node, Exception> getPresenceConditionOf(final CaseSensitivePath path) {
-        final FilePCQuery query = new FilePCQuery(path);
+    default Result<Node, Exception> getPresenceConditionOf(final CaseSensitivePath relativePath) {
+        final FilePCQuery query = new FilePCQuery(relativePath);
         accept(query);
         return query.getResult();
     }

src/main/java/de/variantsync/evolution/variability/pc/visitor/common/FilePCQuery.java

@@ -1,7 +1,7 @@
 package de.variantsync.evolution.variability.pc.visitor.common;
 
-import de.variantsync.evolution.util.io.CaseSensitivePath;
 import de.variantsync.evolution.util.functional.Result;
+import de.variantsync.evolution.util.io.CaseSensitivePath;
 import de.variantsync.evolution.variability.pc.ArtefactTree;
 import de.variantsync.evolution.variability.pc.visitor.ArtefactVisitor;
 import de.variantsync.evolution.variability.pc.visitor.LineBasedAnnotationVisitorFocus;
@@ -12,21 +12,21 @@
 import java.io.FileNotFoundException;
 
 public class FilePCQuery implements ArtefactVisitor {
-    private final CaseSensitivePath path;
+    private final CaseSensitivePath relativePath;
 
     private boolean fileFound = false;
     private Node result = null;
 
-    public FilePCQuery(final CaseSensitivePath path) {
-        this.path = path;
+    public FilePCQuery(final CaseSensitivePath relativePath) {
+        this.relativePath = relativePath;
     }
 
     public Result<Node, Exception> getResult() {
         if (fileFound) {
             return Result.Success(result);
         }
 
-        return Result.Failure(new FileNotFoundException("Could not find file " + path.toString() + "!"));
+        return Result.Failure(new FileNotFoundException("Could not find file " + relativePath.toString() + "!"));
     }
 
     @Override
@@ -38,7 +38,7 @@ public <C extends ArtefactTree<?>> void visitGenericArtefactTreeNode(final Synth
 
     @Override
     public void visitSourceCodeFile(final SourceCodeFileVisitorFocus focus) {
-        if (!fileFound && focus.getValue().getFile().equals(path)) {
+        if (!fileFound && focus.getValue().getFile().equals(relativePath)) {
             result = focus.getValue().getPresenceCondition();
             fileFound = true;
         }

src/main/java/de/variantsync/evolution/variability/pc/visitor/common/LinePCQuery.java

@@ -1,7 +1,7 @@
 package de.variantsync.evolution.variability.pc.visitor.common;
 
-import de.variantsync.evolution.util.io.CaseSensitivePath;
 import de.variantsync.evolution.util.functional.Result;
+import de.variantsync.evolution.util.io.CaseSensitivePath;
 import de.variantsync.evolution.variability.pc.ArtefactTree;
 import de.variantsync.evolution.variability.pc.LineBasedAnnotation;
 import de.variantsync.evolution.variability.pc.SourceCodeFile;
@@ -14,15 +14,15 @@
 import java.io.FileNotFoundException;
 
 public class LinePCQuery implements ArtefactVisitor {
-    private final CaseSensitivePath path;
+    private final CaseSensitivePath relativePath;
     private final int lineNumber;
 
     private SourceCodeFile foundFile = null;
     private boolean lineFound = false;
     private Node result = null;
 
-    public LinePCQuery(final CaseSensitivePath path, final int lineNumber) {
-        this.path = path;
+    public LinePCQuery(final CaseSensitivePath relativePath, final int lineNumber) {
+        this.relativePath = relativePath;
         this.lineNumber = lineNumber;
     }
 
@@ -36,7 +36,7 @@ public Result<Node, Exception> getResult() {
                     "Given line number "
                             + lineNumber
                             + " is not within bounds of file "
-                            + path
+                            + relativePath
                             + " that ranges from "
                             + foundFile.getRootAnnotation().getLineFrom()
                             + " to "
@@ -45,7 +45,7 @@ public Result<Node, Exception> getResult() {
             ));
         }
 
-        return Result.Failure(new FileNotFoundException("Could not find file " + path.toString() + "!"));
+        return Result.Failure(new FileNotFoundException("Could not find file " + relativePath.toString() + "!"));
     }
 
     @Override
@@ -59,7 +59,7 @@ public <C extends ArtefactTree<?>> void visitGenericArtefactTreeNode(final Synth
     @Override
     public void visitSourceCodeFile(final SourceCodeFileVisitorFocus focus) {
 //        Logger.info("visitSourceCodeFile(" + focus.getValue() + ")");
-        if (foundFile == null && focus.getValue().getFile().equals(path)) {
+        if (foundFile == null && focus.getValue().getFile().equals(relativePath)) {
             foundFile = focus.getValue();
             focus.skipRootAnnotationButVisitItsSubtrees(this);
         }