Browse Source

code cleanup

Jan Wittler 4 years ago
parent
commit
4ca83e5fa7

+ 2 - 2
language-api/src/main/java/de/jplag/TokenPrinter.java

@@ -70,7 +70,7 @@ public final class TokenPrinter {
         fileToTokens.forEach((File file, List<Token> fileTokens) -> {
         fileToTokens.forEach((File file, List<Token> fileTokens) -> {
             builder.append(rootDirectory.toPath().relativize(file.toPath()).toString());
             builder.append(rootDirectory.toPath().relativize(file.toPath()).toString());
 
 
-            List<LineData> lineDatas = getLineData(fileTokens, rootDirectory, suffix);
+            List<LineData> lineDatas = getLineData(fileTokens, suffix);
             lineDatas.forEach(lineData -> {
             lineDatas.forEach(lineData -> {
                 builder.setLine(lineData.lineNumber());
                 builder.setLine(lineData.lineNumber());
 
 
@@ -113,7 +113,7 @@ public final class TokenPrinter {
         return builder.toString();
         return builder.toString();
     }
     }
 
 
-    private static List<LineData> getLineData(List<Token> fileTokens, File root, Optional<String> suffix) {
+    private static List<LineData> getLineData(List<Token> fileTokens, Optional<String> suffix) {
         // We expect that all fileTokens share the same Token.file!
         // We expect that all fileTokens share the same Token.file!
         File file = fileTokens.get(0).getFile();
         File file = fileTokens.get(0).getFile();
         if (suffix.isPresent()) {
         if (suffix.isPresent()) {

+ 1 - 1
languages/emf-metamodel/src/main/java/de/jplag/emf/util/EMFUtil.java

@@ -66,7 +66,7 @@ public final class EMFUtil {
             final Resource resource = resourceSet.getResource(URI.createFileURI(file.getAbsolutePath()), true);
             final Resource resource = resourceSet.getResource(URI.createFileURI(file.getAbsolutePath()), true);
             return resource.getContents();
             return resource.getContents();
         } catch (WrappedException exception) {
         } catch (WrappedException exception) {
-            logger.error("Could not load " + file.getName() + ": " + exception.getCause().getMessage());
+            logger.error("Could not load {}: {}", file, exception.getCause().getMessage());
         }
         }
         return null;
         return null;
     }
     }

+ 0 - 1
languages/java/src/main/java/de/jplag/java/JavacAdapter.java

@@ -40,7 +40,6 @@ public class JavacAdapter {
             final Trees trees = Trees.instance(task);
             final Trees trees = Trees.instance(task);
             final SourcePositions positions = trees.getSourcePositions();
             final SourcePositions positions = trees.getSourcePositions();
             for (final CompilationUnitTree ast : executeCompilationTask(task, parser.logger)) {
             for (final CompilationUnitTree ast : executeCompilationTask(task, parser.logger)) {
-                final String filename = ast.getSourceFile().getName();
                 File file = new File(ast.getSourceFile().toUri());
                 File file = new File(ast.getSourceFile().toUri());
                 final LineMap map = ast.getLineMap();
                 final LineMap map = ast.getLineMap();
                 ast.accept(new TokenGeneratingTreeScanner(file, parser, map, positions, ast), null);
                 ast.accept(new TokenGeneratingTreeScanner(file, parser, map, positions, ast), null);