minor fixes

app/src/main/java/webshell/app/files/SearchOperations.java

@@ -1,48 +1,45 @@
-/**
- * 
- */
-package webshell.app.files;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Component;
-
-import webshell.app.files.search.SearchResult;
-import webshell.app.files.search.SearchTask;
-
-/**
- * @author subhro
- *
- */
-@Component
-public class SearchOperations {
-	private final Map<String, SearchTask> pendingOperations = new ConcurrentHashMap<>();
-	private final ExecutorService threadPool = Executors.newFixedThreadPool(5);
-
-	public String createSearchTask(String folder, String searchText) {
-		SearchTask task = new SearchTask(folder, searchText);
-		pendingOperations.put(task.getId(), task);
-		threadPool.submit(task);
-		return task.getId();
-	}
-
-	public SearchResult getSearchResult(String id, int fileIndex,
-			int folderIndex) {
-		SearchTask task = pendingOperations.get(id);
-		SearchResult res = new SearchResult(task.isDone(),
-				task.getFiles().stream().skip(fileIndex)
-						.collect(Collectors.toList()),
-				task.getFolders().stream().skip(folderIndex)
-						.collect(Collectors.toList()));
-		return res;
-	}
-
-	public void cancelSearch(String id) {
-		SearchTask task = pendingOperations.get(id);
-		task.stop();
-	}
-}
+/**
+ * 
+ */
+package webshell.app.files;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Component;
+
+import webshell.app.files.search.SearchResult;
+import webshell.app.files.search.SearchTask;
+
+/**
+ * @author subhro
+ *
+ */
+@Component
+public class SearchOperations {
+	private final Map<String, SearchTask> pendingOperations = new ConcurrentHashMap<>();
+	private final ExecutorService threadPool = Executors.newFixedThreadPool(5);
+
+	public String createSearchTask(String folder, String searchText) {
+		SearchTask task = new SearchTask(folder, searchText);
+		pendingOperations.put(task.getId(), task);
+		threadPool.submit(task);
+		return task.getId();
+	}
+
+	public SearchResult getSearchResult(String id, int fileIndex,
+			int folderIndex) {
+		SearchTask task = pendingOperations.get(id);
+		SearchResult res = new SearchResult(task.isDone(), task.getFiles()
+				.stream().skip(fileIndex).collect(Collectors.toList()));
+		return res;
+	}
+
+	public void cancelSearch(String id) {
+		SearchTask task = pendingOperations.get(id);
+		task.stop();
+	}
+}

app/src/main/java/webshell/app/files/search/SearchResult.java

@@ -1,71 +1,57 @@
-/**
- * 
- */
-package webshell.app.files.search;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author subhro
- *
- */
-public class SearchResult {
-	/**
-	 * @param isDone
-	 * @param files
-	 * @param folders
-	 */
-	public SearchResult(boolean isDone, List<String> files,
-			List<String> folders) {
-		super();
-		this.isDone = isDone;
-		this.files = files;
-		this.folders = folders;
-	}
-
-	private boolean isDone;
-	private List<String> files = new ArrayList<>(), folders = new ArrayList<>();
-
-	/**
-	 * @return the isDone
-	 */
-	public boolean isDone() {
-		return isDone;
-	}
-
-	/**
-	 * @param isDone the isDone to set
-	 */
-	public void setDone(boolean isDone) {
-		this.isDone = isDone;
-	}
-
-	/**
-	 * @return the files
-	 */
-	public List<String> getFiles() {
-		return files;
-	}
-
-	/**
-	 * @param files the files to set
-	 */
-	public void setFiles(List<String> files) {
-		this.files = files;
-	}
-
-	/**
-	 * @return the folders
-	 */
-	public List<String> getFolders() {
-		return folders;
-	}
-
-	/**
-	 * @param folders the folders to set
-	 */
-	public void setFolders(List<String> folders) {
-		this.folders = folders;
-	}
-}
+/**
+ * 
+ */
+package webshell.app.files.search;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import webshell.app.files.FileInfo;
+
+/**
+ * @author subhro
+ *
+ */
+public class SearchResult {
+	/**
+	 * @param isDone
+	 * @param files
+	 * @param folders
+	 */
+	public SearchResult(boolean isDone, List<FileInfo> files) {
+		super();
+		this.isDone = isDone;
+		this.files = files;
+	}
+
+	private boolean isDone;
+	private List<FileInfo> files = new ArrayList<>();
+
+	/**
+	 * @return the isDone
+	 */
+	public boolean isDone() {
+		return isDone;
+	}
+
+	/**
+	 * @param isDone the isDone to set
+	 */
+	public void setDone(boolean isDone) {
+		this.isDone = isDone;
+	}
+
+	/**
+	 * @return the files
+	 */
+	public List<FileInfo> getFiles() {
+		return files;
+	}
+
+	/**
+	 * @param files the files to set
+	 */
+	public void setFiles(List<FileInfo> files) {
+		this.files = files;
+	}
+}