From bc9eb0a26715f33b6e1c117317bfeb4e51cea43e Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sat, 23 Feb 2008 21:33:09 +0000 Subject: [PATCH] replaced all printStackTrace statements with Logger statements --- source/Main.java | 3 ++- .../sourceforge/filebot/ui/FileBotList.java | 5 +++- .../sourceforge/filebot/ui/FileBotTree.java | 12 +++++---- .../sourceforge/filebot/ui/FileBotUtil.java | 13 ++++++++- .../filebot/ui/panel/analyze/FileTree.java | 9 ------- .../ui/panel/analyze/tools/SplitPanel.java | 5 +++- .../ui/panel/analyze/tools/TypePanel.java | 5 +++- .../list/FileListTransferablePolicy.java | 9 ++++--- .../FilesRenameListTransferablePolicy.java | 7 +++-- .../NamesRenameListTransferablePolicy.java | 11 ++++---- .../ui/panel/search/HyperlinkLabel.java | 9 ++++--- .../filebot/ui/panel/search/SearchPanel.java | 27 ++++++------------- .../filebot/ui/panel/sfv/Checksum.java | 5 +++- .../filebot/ui/panel/sfv/SfvTable.java | 5 +++- .../ui/panel/sfv/SfvTransferablePolicy.java | 22 +++++---------- .../ui/transfer/SaveableExportHandler.java | 8 ++++-- .../FileTransferablePolicy.java | 21 ++++++++------- .../TextTransferablePolicy.java | 5 +++- 18 files changed, 97 insertions(+), 84 deletions(-) diff --git a/source/Main.java b/source/Main.java index 0e96fe8d..f62eb5af 100644 --- a/source/Main.java +++ b/source/Main.java @@ -18,7 +18,8 @@ public class Main { try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Exception e) { - e.printStackTrace(); + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } SwingUtilities.invokeLater(new Runnable() { diff --git a/source/net/sourceforge/filebot/ui/FileBotList.java b/source/net/sourceforge/filebot/ui/FileBotList.java index 857b832a..cff93888 100644 --- a/source/net/sourceforge/filebot/ui/FileBotList.java +++ b/source/net/sourceforge/filebot/ui/FileBotList.java @@ -8,6 +8,8 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.PrintStream; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.BorderFactory; @@ -132,7 +134,8 @@ public class FileBotList extends JPanel implements Saveable, TransferablePolicyS out.close(); } catch (FileNotFoundException e) { - e.printStackTrace(); + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } } diff --git a/source/net/sourceforge/filebot/ui/FileBotTree.java b/source/net/sourceforge/filebot/ui/FileBotTree.java index 741015a9..1fb564d1 100644 --- a/source/net/sourceforge/filebot/ui/FileBotTree.java +++ b/source/net/sourceforge/filebot/ui/FileBotTree.java @@ -11,6 +11,8 @@ import java.io.File; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.JMenuItem; @@ -101,7 +103,7 @@ public class FileBotTree extends JTree implements TransferablePolicySupport { Object userObject = node.getUserObject(); - if (userObject != null && userObject instanceof File) { + if ((userObject != null) && (userObject instanceof File)) { File file = (File) node.getUserObject(); return file.getName(); } @@ -186,12 +188,12 @@ public class FileBotTree extends JTree implements TransferablePolicySupport { } - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent event) { try { Desktop.getDesktop().open(file); - } catch (Exception ex) { - MessageManager.showWarning(ex.getMessage()); - ex.printStackTrace(); + } catch (Exception e) { + MessageManager.showWarning(e.getMessage()); + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } } } diff --git a/source/net/sourceforge/filebot/ui/FileBotUtil.java b/source/net/sourceforge/filebot/ui/FileBotUtil.java index 9bb1f408..5104d729 100644 --- a/source/net/sourceforge/filebot/ui/FileBotUtil.java +++ b/source/net/sourceforge/filebot/ui/FileBotUtil.java @@ -3,6 +3,8 @@ package net.sourceforge.filebot.ui; import java.awt.datatransfer.DataFlavor; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.Action; import javax.swing.JComponent; @@ -42,10 +44,19 @@ public class FileBotUtil { return new DataFlavor("text/uri-list;class=java.lang.String"); } catch (ClassNotFoundException e) { // will never happen - e.printStackTrace(); + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } return null; } + + public static Throwable getRootCause(Throwable t) { + while (t.getCause() != null) { + t = t.getCause(); + } + + return t; + } + } diff --git a/source/net/sourceforge/filebot/ui/panel/analyze/FileTree.java b/source/net/sourceforge/filebot/ui/panel/analyze/FileTree.java index 32fb5132..11aefae2 100644 --- a/source/net/sourceforge/filebot/ui/panel/analyze/FileTree.java +++ b/source/net/sourceforge/filebot/ui/panel/analyze/FileTree.java @@ -110,15 +110,6 @@ public class FileTree extends FileBotTree { } - /** - * This method will not be used - */ - @Override - protected boolean load(File file) { - return false; - } - - public void propertyChange(PropertyChangeEvent evt) { Boolean loading = (Boolean) evt.getNewValue(); diff --git a/source/net/sourceforge/filebot/ui/panel/analyze/tools/SplitPanel.java b/source/net/sourceforge/filebot/ui/panel/analyze/tools/SplitPanel.java index 8e7d4557..e6202a17 100644 --- a/source/net/sourceforge/filebot/ui/panel/analyze/tools/SplitPanel.java +++ b/source/net/sourceforge/filebot/ui/panel/analyze/tools/SplitPanel.java @@ -7,6 +7,8 @@ import java.awt.Color; import java.awt.Dimension; import java.io.File; import java.util.Collection; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.BorderFactory; import javax.swing.Box; @@ -180,7 +182,8 @@ public class SplitPanel extends ToolPanel implements ChangeListener { tree.setModel(model); } catch (Exception e) { - e.printStackTrace(); + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } SplitPanel.this.firePropertyChange(LOADING_PROPERTY, null, false); diff --git a/source/net/sourceforge/filebot/ui/panel/analyze/tools/TypePanel.java b/source/net/sourceforge/filebot/ui/panel/analyze/tools/TypePanel.java index f851fe0f..5f04242a 100644 --- a/source/net/sourceforge/filebot/ui/panel/analyze/tools/TypePanel.java +++ b/source/net/sourceforge/filebot/ui/panel/analyze/tools/TypePanel.java @@ -8,6 +8,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.TreeMap; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.BorderFactory; import javax.swing.JScrollPane; @@ -128,7 +130,8 @@ public class TypePanel extends ToolPanel { tree.setModel(model); } catch (Exception e) { - e.printStackTrace(); + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } TypePanel.this.firePropertyChange(LOADING_PROPERTY, null, false); diff --git a/source/net/sourceforge/filebot/ui/panel/list/FileListTransferablePolicy.java b/source/net/sourceforge/filebot/ui/panel/list/FileListTransferablePolicy.java index a2ebbf17..e9406b74 100644 --- a/source/net/sourceforge/filebot/ui/panel/list/FileListTransferablePolicy.java +++ b/source/net/sourceforge/filebot/ui/panel/list/FileListTransferablePolicy.java @@ -4,6 +4,8 @@ package net.sourceforge.filebot.ui.panel.list; import java.io.File; import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; import net.sourceforge.filebot.torrent.Torrent; import net.sourceforge.filebot.ui.FileFormat; @@ -33,7 +35,7 @@ public class FileListTransferablePolicy extends FileTransferablePolicy { @Override - protected boolean load(File file) { + protected void load(File file) { if (file.isDirectory()) { list.setTitle(file.getName()); @@ -49,12 +51,11 @@ public class FileListTransferablePolicy extends FileTransferablePolicy { list.getModel().addElement(FileFormat.getNameWithoutSuffix(entry.getName())); } } catch (IOException e) { - e.printStackTrace(); + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } } } - - return true; } diff --git a/source/net/sourceforge/filebot/ui/panel/rename/FilesRenameListTransferablePolicy.java b/source/net/sourceforge/filebot/ui/panel/rename/FilesRenameListTransferablePolicy.java index fa22c9ed..2395ab2f 100644 --- a/source/net/sourceforge/filebot/ui/panel/rename/FilesRenameListTransferablePolicy.java +++ b/source/net/sourceforge/filebot/ui/panel/rename/FilesRenameListTransferablePolicy.java @@ -34,17 +34,16 @@ public class FilesRenameListTransferablePolicy extends FileTransferablePolicy { @Override - protected boolean load(File file) { + protected void load(File file) { if (file.isDirectory()) { File subfiles[] = file.listFiles(); Arrays.sort(subfiles); for (File f : subfiles) listModel.addElement(new FileEntry(f)); - } else + } else { listModel.addElement(new FileEntry(file)); - - return true; + } } diff --git a/source/net/sourceforge/filebot/ui/panel/rename/NamesRenameListTransferablePolicy.java b/source/net/sourceforge/filebot/ui/panel/rename/NamesRenameListTransferablePolicy.java index 5092f8ef..b0f88c94 100644 --- a/source/net/sourceforge/filebot/ui/panel/rename/NamesRenameListTransferablePolicy.java +++ b/source/net/sourceforge/filebot/ui/panel/rename/NamesRenameListTransferablePolicy.java @@ -6,6 +6,8 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.DefaultListModel; @@ -49,7 +51,7 @@ public class NamesRenameListTransferablePolicy extends MultiTransferablePolicy { @Override - protected boolean load(File file) { + protected void load(File file) { try { if (FileFormat.getSuffix(file).equalsIgnoreCase("torrent")) { Torrent torrent = new Torrent(file); @@ -68,13 +70,10 @@ public class NamesRenameListTransferablePolicy extends MultiTransferablePolicy { in.close(); } - - return true; } catch (Exception e) { - e.printStackTrace(); + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } - - return false; } diff --git a/source/net/sourceforge/filebot/ui/panel/search/HyperlinkLabel.java b/source/net/sourceforge/filebot/ui/panel/search/HyperlinkLabel.java index 2472d6b3..61ecbedc 100644 --- a/source/net/sourceforge/filebot/ui/panel/search/HyperlinkLabel.java +++ b/source/net/sourceforge/filebot/ui/panel/search/HyperlinkLabel.java @@ -10,6 +10,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.net.URL; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.JLabel; @@ -31,11 +33,12 @@ public class HyperlinkLabel extends JLabel { private MouseListener linker = new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mouseClicked(MouseEvent event) { try { Desktop.getDesktop().browse(url.toURI()); - } catch (Exception ex) { - ex.printStackTrace(); + } catch (Exception e) { + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } } diff --git a/source/net/sourceforge/filebot/ui/panel/search/SearchPanel.java b/source/net/sourceforge/filebot/ui/panel/search/SearchPanel.java index b0b34904..27c01a5c 100644 --- a/source/net/sourceforge/filebot/ui/panel/search/SearchPanel.java +++ b/source/net/sourceforge/filebot/ui/panel/search/SearchPanel.java @@ -14,6 +14,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.BorderFactory; @@ -323,14 +325,8 @@ public class SearchPanel extends FileBotPanel { } catch (Exception e) { tabbedPane.remove(episodeList); - Throwable t = e; - - while (t.getCause() != null) { - t = t.getCause(); - } - - MessageManager.showWarning(t.toString()); - t.printStackTrace(); + MessageManager.showWarning(FileBotUtil.getRootCause(e).getMessage()); + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); return; } @@ -348,8 +344,9 @@ public class SearchPanel extends FileBotPanel { select.setIconImage(episodeList.getIcon().getImage()); select.setVisible(true); showname = select.getSelectedValue(); - } else + } else { MessageManager.showWarning("\"" + task.getSearchTerm() + "\" has not been found."); + } if (showname == null) { tabbedPane.remove(episodeList); @@ -409,16 +406,8 @@ public class SearchPanel extends FileBotPanel { } catch (Exception e) { tabbedPane.remove(episodeList); - Throwable t = e; - - // find root cause - - while (t.getCause() != null) { - t = t.getCause(); - } - - MessageManager.showWarning(t.toString()); - t.printStackTrace(); + MessageManager.showWarning(FileBotUtil.getRootCause(e).getMessage()); + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } } diff --git a/source/net/sourceforge/filebot/ui/panel/sfv/Checksum.java b/source/net/sourceforge/filebot/ui/panel/sfv/Checksum.java index bbafc963..1fda43bc 100644 --- a/source/net/sourceforge/filebot/ui/panel/sfv/Checksum.java +++ b/source/net/sourceforge/filebot/ui/panel/sfv/Checksum.java @@ -6,6 +6,8 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; import net.sourceforge.tuned.ui.SwingWorkerPropertyChangeAdapter; @@ -132,8 +134,9 @@ public class Checksum { setChecksum(computationTask.get()); } } catch (Exception e) { + // might happen if file system is corrupt (e.g. CRC errors) setChecksumError(e); - e.printStackTrace(); + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.WARNING, e.getMessage()); } } } diff --git a/source/net/sourceforge/filebot/ui/panel/sfv/SfvTable.java b/source/net/sourceforge/filebot/ui/panel/sfv/SfvTable.java index 01f9c7ab..7eb8bc72 100644 --- a/source/net/sourceforge/filebot/ui/panel/sfv/SfvTable.java +++ b/source/net/sourceforge/filebot/ui/panel/sfv/SfvTable.java @@ -10,6 +10,8 @@ import java.io.PrintStream; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.JTable; import javax.swing.ListSelectionModel; @@ -162,7 +164,8 @@ public class SfvTable extends JTable implements TransferablePolicySupport, Savea out.close(); } catch (FileNotFoundException e) { - e.printStackTrace(); + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } } diff --git a/source/net/sourceforge/filebot/ui/panel/sfv/SfvTransferablePolicy.java b/source/net/sourceforge/filebot/ui/panel/sfv/SfvTransferablePolicy.java index 12268585..8bac940c 100644 --- a/source/net/sourceforge/filebot/ui/panel/sfv/SfvTransferablePolicy.java +++ b/source/net/sourceforge/filebot/ui/panel/sfv/SfvTransferablePolicy.java @@ -5,8 +5,11 @@ package net.sourceforge.filebot.ui.panel.sfv; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; +import java.io.IOException; import java.io.InputStreamReader; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -64,7 +67,7 @@ public class SfvTransferablePolicy extends MultiTransferablePolicy { @Override - protected boolean load(File sfvFile) { + protected void load(File sfvFile) { try { BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(sfvFile))); @@ -95,12 +98,10 @@ public class SfvTransferablePolicy extends MultiTransferablePolicy { } in.close(); - } catch (Exception e) { - e.printStackTrace(); - return false; + } catch (IOException e) { + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } - - return true; } @@ -169,15 +170,6 @@ public class SfvTransferablePolicy extends MultiTransferablePolicy { } - /** - * this method will not be used - */ - @Override - protected boolean load(File file) { - return false; - } - - @Override public String getDescription() { return "files and folders"; diff --git a/source/net/sourceforge/filebot/ui/transfer/SaveableExportHandler.java b/source/net/sourceforge/filebot/ui/transfer/SaveableExportHandler.java index e5c266b4..d8dcc84a 100644 --- a/source/net/sourceforge/filebot/ui/transfer/SaveableExportHandler.java +++ b/source/net/sourceforge/filebot/ui/transfer/SaveableExportHandler.java @@ -7,6 +7,8 @@ import java.awt.datatransfer.Transferable; import java.io.File; import java.io.IOException; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.JComponent; import javax.swing.TransferHandler; @@ -37,7 +39,8 @@ public class SaveableExportHandler implements ExportHandler { file.deleteOnExit(); } } catch (Exception e) { - e.printStackTrace(); + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } } @@ -60,7 +63,8 @@ public class SaveableExportHandler implements ExportHandler { saveable.save(temporaryFile); return new FileTransferable(temporaryFile); } catch (IOException e) { - e.printStackTrace(); + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } return null; diff --git a/source/net/sourceforge/filebot/ui/transferablepolicies/FileTransferablePolicy.java b/source/net/sourceforge/filebot/ui/transferablepolicies/FileTransferablePolicy.java index 5345adae..70bb62c5 100644 --- a/source/net/sourceforge/filebot/ui/transferablepolicies/FileTransferablePolicy.java +++ b/source/net/sourceforge/filebot/ui/transferablepolicies/FileTransferablePolicy.java @@ -4,9 +4,7 @@ package net.sourceforge.filebot.ui.transferablepolicies; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; import java.io.File; -import java.io.IOException; import java.net.URI; import java.util.ArrayList; import java.util.Collections; @@ -63,10 +61,9 @@ public abstract class FileTransferablePolicy extends TransferablePolicy { return files; } - } catch (UnsupportedFlavorException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); + } catch (Exception e) { + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } return null; @@ -105,12 +102,18 @@ public abstract class FileTransferablePolicy extends TransferablePolicy { } - protected abstract boolean accept(File file); + protected boolean accept(File file) { + return false; + } - protected abstract void clear(); + protected void clear() { + + } - protected abstract boolean load(File file); + protected void load(File file) { + + } } diff --git a/source/net/sourceforge/filebot/ui/transferablepolicies/TextTransferablePolicy.java b/source/net/sourceforge/filebot/ui/transferablepolicies/TextTransferablePolicy.java index 5402997d..bec9fb6f 100644 --- a/source/net/sourceforge/filebot/ui/transferablepolicies/TextTransferablePolicy.java +++ b/source/net/sourceforge/filebot/ui/transferablepolicies/TextTransferablePolicy.java @@ -4,6 +4,8 @@ package net.sourceforge.filebot.ui.transferablepolicies; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; +import java.util.logging.Level; +import java.util.logging.Logger; public abstract class TextTransferablePolicy extends TransferablePolicy { @@ -28,7 +30,8 @@ public abstract class TextTransferablePolicy extends TransferablePolicy { load(string); } catch (Exception e) { - e.printStackTrace(); + // should not happen + Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.SEVERE, e.getMessage(), e); } }