Skip to content
Snippets Groups Projects
Commit 0770225c authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

FileListManager uses a Logger instead of println

parent 19acc5c1
No related branches found
No related tags found
No related merge requests found
......@@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
......@@ -13,6 +14,8 @@ import javax.swing.JOptionPane;
import javax.swing.SwingWorker;
import javax.swing.filechooser.FileSystemView;
import org.slf4j.Logger;
import fr.soleil.cdma.box.util.GUIUtilities;
import fr.soleil.cdma.box.util.comparator.LongComparator;
import fr.soleil.data.mediator.Mediator;
......@@ -31,16 +34,18 @@ import fr.soleil.lib.project.resource.MessageManager;
*/
public class FileListManager implements IFileManager {
private File[] availableFiles;
private final BasicDataSource<File[]> fileListSource;
private FileRefresher refresher;
private MessageManager messageManager;
private final Logger logger;
private File[] availableFiles;
private FileRefresher refresher;
private String workingPath;
private boolean waitForStability;
private String[] filteredExtensions;
public FileListManager(MessageManager messageManager, String... filteredExtensions) {
public FileListManager(MessageManager messageManager, Logger logger, String... filteredExtensions) {
this.messageManager = messageManager;
this.logger = logger;
this.filteredExtensions = filteredExtensions;
availableFiles = null;
workingPath = null;
......@@ -210,9 +215,9 @@ public class FileListManager implements IFileManager {
public static final String SLEEPING_TIME_PROPERTY = "SLEEPING_TIME";
public static final String VERBOSE_PROPERTY = "VERBOSE_REFRESHER";
protected final HashMap<String, File> knownFiles;
protected final HashMap<String, Long> lastKnownLength;
protected final HashMap<String, Long> lastKnownModificationDate;
protected final Map<String, File> knownFiles;
protected final Map<String, Long> lastKnownLength;
protected final Map<String, Long> lastKnownModificationDate;
private String path;
private volatile boolean canceled;
......@@ -292,7 +297,7 @@ public class FileListManager implements IFileManager {
infoBuffer.append(messageManager
.getMessage("fr.soleil.cdma.box.manager.FileListManager.Refresh.seconds"));
}
System.out.println(infoBuffer.toString());
logger.trace(infoBuffer.toString());
infoBuffer = null;
} // end if (verbose)
if (!isCanceled()) {
......@@ -315,7 +320,7 @@ public class FileListManager implements IFileManager {
messageBuffer.append(t.getMessage());
JOptionPane.showMessageDialog(parentComponent, messageBuffer.toString(),
messageManager.getMessage("fr.soleil.cdma.box.Error"), JOptionPane.ERROR_MESSAGE);
System.err.println(messageBuffer.toString());
logger.error(messageBuffer.toString());
}
}
}
......
......@@ -129,7 +129,8 @@ public class FileView extends JPanel implements IBooleanTarget {
}
}
});
fileManager = new FileListManager(messageManager, filteredExtensions);
fileManager = new FileListManager(messageManager, LoggerFactory.getLogger(this.applicationId),
filteredExtensions);
fileManager.setWaitForStability(false);
fileTreeModelListener = new TreeModelListener() {
@Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment