cleanup the way of getting the s. file

Author: vladak

opengrok-indexer/src/main/java/org/opengrok/indexer/history/SCCSHistoryParser.java

@@ -27,6 +27,7 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
+import java.nio.file.Paths;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -254,7 +255,7 @@ private static File getSCCSFile(File file) {
     }
 
     static File getSCCSFile(String parent, String name) {
-        File f = new File(parent + "/SCCS/s." + name);
+        File f = Paths.get(parent, "SCCS", "s." + name).toFile();
         if (!f.exists()) {
             return null;
         }

opengrok-indexer/src/main/java/org/opengrok/indexer/history/SCCSRepository.java

@@ -148,7 +148,10 @@ public boolean fileHasAnnotation(File file) {
     public boolean fileHasHistory(File file) {
         String parentFile = file.getParent();
         String name = file.getName();
-        File f = Paths.get(parentFile, "SCCS", "s." + name).toFile();
+        File f = SCCSHistoryParser.getSCCSFile(parentFile, name);
+        if (f == null) {
+            return false;
+        }
         return f.exists();
     }