Code style

testmycode · May 17, 2016 · 0080492 · 0080492
1 parent 4d3baad
commit 0080492
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/...gs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/ConfigurableStudentFilePolicy.java b/...gs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/ConfigurableStudentFilePolicy.java
@@ -1,6 +1,7 @@
 package fi.helsinki.cs.tmc.langs.io;
 
 import fi.helsinki.cs.tmc.langs.utils.TmcProjectYmlParser;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,8 +62,11 @@ public boolean isStudentFile(Path path, Path projectRootPath) {
 
         this.rootPath = projectRootPath;
 
-        return isExtraStudentFile(path) || projectRootPath.equals(path) ||
-                isStudentSourceFile(path.subpath(projectRootPath.getNameCount(), path.getNameCount()), projectRootPath);
+        return isExtraStudentFile(path)
+                || projectRootPath.equals(path)
+                || isStudentSourceFile(
+                        path.subpath(projectRootPath.getNameCount(), path.getNameCount()),
+                        projectRootPath);
     }
 
     /**

diff --git a/...langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/zip/StudentFileAwareZipper.java b/...langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/zip/StudentFileAwareZipper.java
@@ -50,7 +50,8 @@ public byte[] zip(Path rootDirectory) throws IOException {
         return buffer.toByteArray();
     }
 
-    private void zipRecursively(Path currentPath, ZipArchiveOutputStream zipStream, Path projectRoot)
+    private void zipRecursively(
+            Path currentPath, ZipArchiveOutputStream zipStream, Path projectRoot)
             throws IOException {
 
         log.trace("Processing {}", currentPath);
@@ -84,7 +85,8 @@ private boolean isExplicitlyIgnoredDirectory(Path currentPath) throws IOExceptio
             return false;
         }
 
-        log.trace("Found directory {} while zipping, checking children for .tmcnosubmit",
+        log.trace(
+                "Found directory {} while zipping, checking children for .tmcnosubmit",
                 currentPath);
 
         try (DirectoryStream<Path> directory = Files.newDirectoryStream(currentPath)) {
@@ -107,7 +109,6 @@ private void writeToZip(Path currentPath, ZipArchiveOutputStream zipStream, Path
 
         log.trace("Writing {} to zip", currentPath);
 
-
         String name = projectPath.getParent().relativize(currentPath).toString();
 
         if (Files.isDirectory(currentPath)) {