git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/PathItemsCollectorStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/PathItemsCollectorStep.java
index 725bca4f4098a1dbe77be55f71eb9ce9a29d6f9a..c055c4893266f11c63aff382ed973e0a85eed0f1 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/PathItemsCollectorStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/PathItemsCollectorStep.java
@@ -16,9 +16,8 @@ import org.apache.logging.log4j.Logger;
 \r
 import com.ibm.nosql.json.api.BasicDBObject;\r
 \r
-/* DO NOT REMOVE!\r
-import user.jobengine.server.steps.FileSearchFilterOptions;\r
-*/\r
+import user.jobengine.server.steps.shared.FileSearchFilterOptions;\r
+\r
 public class PathItemsCollectorStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
 \r
@@ -32,7 +31,7 @@ public class PathItemsCollectorStep extends JobStep {
 \r
                List<String> files = new ArrayList<>();\r
 \r
-               //teljes rekurzivitas szuressel\r
+               // teljes rekurzivitas szuressel\r
                FileSearchFilterOptions filterOptions = createFileFilter(filter);\r
                FileVisitor<Path> visitor = new SimpleFileVisitor<Path>() {\r
                        @Override\r
@@ -60,7 +59,8 @@ public class PathItemsCollectorStep extends JobStep {
                try {\r
                        Files.walkFileTree(sourcePath, visitor);\r
                } catch (Exception e) {\r
-                       logger.error(getSessionMarker(), "Hiba a '{}' mappa feldolgozásában. A rendszer hibaüzenete: {}", sourcePath, e.getMessage());\r
+                       logger.error(getSessionMarker(), "Hiba a '{}' mappa feldolgozásában. A rendszer hibaüzenete: {}",\r
+                                       sourcePath, e.getMessage());\r
                        logger.catching(e);\r
                        throw e;\r
                } finally {\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/RundownFilesCollectorStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/RundownFilesCollectorStep.java
index 8b104d9b5574aa10eaf981c9c3825e8a939ec8e4..fa6fd42733545e451212491860df97efb6754e7c 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/RundownFilesCollectorStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/RundownFilesCollectorStep.java
@@ -9,9 +9,8 @@ import org.apache.logging.log4j.Logger;
 \r
 import com.ibm.nosql.json.api.BasicDBObject;\r
 \r
-/* DO NOT REMOVE!\r
-import user.jobengine.server.steps.FileSearchFilterOptions;\r
-*/\r
+import user.jobengine.server.steps.shared.FileSearchFilterOptions;\r
+\r
 public class RundownFilesCollectorStep extends PathItemsCollectorStep {\r
        private static final Logger logger = LogManager.getLogger();\r
 \r
@@ -25,7 +24,8 @@ public class RundownFilesCollectorStep extends PathItemsCollectorStep {
                FileSearchFilterOptions result = new FileSearchFilterOptions(filter) {\r
                        @Override\r
                        public boolean acceptFile(Path file) {\r
-                               if (file.toString().contains(df.format(thisMonthCal.getTime())) || file.toString().contains(df.format(nextMonthCal.getTime())))\r
+                               if (file.toString().contains(df.format(thisMonthCal.getTime()))\r
+                                               || file.toString().contains(df.format(nextMonthCal.getTime())))\r
                                        return super.acceptFile(file);\r
 \r
                                return false;\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileSearchFilterOptions.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/FileSearchFilterOptions.java
similarity index 91%
rename from server/user.jobengine.executors/src/user/jobengine/server/steps/FileSearchFilterOptions.java
rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/FileSearchFilterOptions.java
index 436c3be0127cb69771f873c6b967f56a6feaf196..b5a8d0e815d3927c35ea5bbe1be91188f68ed7a3 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileSearchFilterOptions.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/FileSearchFilterOptions.java
@@ -1,4 +1,4 @@
-package user.jobengine.server.steps;\r
+package user.jobengine.server.steps.shared;\r
 \r
 import java.nio.file.Path;\r
 import java.util.regex.Matcher;\r