From 9569b311b0489e4c181cc9bbfa88d9546a0f156b Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 2 Dec 2013 15:30:46 +0200 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=87=D0=B8?= =?UTF-8?q?=D0=BA=20try/catch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tse/lr3/DirCopy.java | 9 ++++++--- src/tse/lr3/DirFindText.java | 11 ++++++++--- src/tse/lr3/DirZip.java | 3 ++- src/tse/lr3/LR_3_Tasks.java | 7 ++++--- src/tse/lr4/AccountManager.java | 5 +++-- src/tse/lr4/NotePadManager.java | 5 +++-- src/tse/lr5/CsvReader.java | 5 ++--- src/tse/lr5/TrianglesWindow.java | 2 +- 8 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/tse/lr3/DirCopy.java b/src/tse/lr3/DirCopy.java index abb60f6..34d49e3 100644 --- a/src/tse/lr3/DirCopy.java +++ b/src/tse/lr3/DirCopy.java @@ -9,6 +9,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.nio.channels.FileChannel; +import tse.Util; /** * @@ -39,7 +40,7 @@ public class DirCopy extends AbstractFileChooser { new OutputStreamWriter(new FileOutputStream(logFile, true), "UTF-8") ); } catch (IOException ex) { - ex.printStackTrace(); + Util.handleException(ex); } } @@ -56,7 +57,7 @@ public class DirCopy extends AbstractFileChooser { copyFile(file, dirDest); writeLog(file.getAbsolutePath()); } catch (IOException ex) { - ex.printStackTrace(); + Util.handleException(ex); } } } else writeLog("Нечего копировать из " + dirSource.getAbsolutePath()); @@ -97,7 +98,9 @@ public class DirCopy extends AbstractFileChooser { try { writer.write(filename); writer.newLine(); - } catch (IOException ex) { } + } catch (IOException ex) { + Util.handleException(ex); + } } private final FileFilter lastModifiedFilter = new FileFilter() { diff --git a/src/tse/lr3/DirFindText.java b/src/tse/lr3/DirFindText.java index a2052f7..b622ee0 100644 --- a/src/tse/lr3/DirFindText.java +++ b/src/tse/lr3/DirFindText.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import tse.Util; /** * @@ -43,7 +44,7 @@ public class DirFindText extends AbstractFileChooser { new OutputStreamWriter(new FileOutputStream(logFile, true), "UTF-8") ); } catch (IOException ex) { - ex.printStackTrace(); + Util.handleException(ex); } } @@ -69,7 +70,9 @@ public class DirFindText extends AbstractFileChooser { // Ищем строку в файле try { findString(file, SEARCH_TEXT); - } catch (IOException ex) {} + } catch (IOException ex) { + Util.handleException(ex); + } } } } @@ -105,7 +108,9 @@ public class DirFindText extends AbstractFileChooser { try { writer.write(filename); writer.newLine(); - } catch (IOException ex) { } + } catch (IOException ex) { + Util.handleException(ex); + } } private class FindInfo { diff --git a/src/tse/lr3/DirZip.java b/src/tse/lr3/DirZip.java index 96b02f2..c06d0e1 100644 --- a/src/tse/lr3/DirZip.java +++ b/src/tse/lr3/DirZip.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; +import tse.Util; /** * @@ -48,7 +49,7 @@ public class DirZip extends AbstractFileChooser { zos.close(); } } catch (IOException ex) { - ex.printStackTrace(); + Util.handleException(ex); } System.out.println("Готово!"); } diff --git a/src/tse/lr3/LR_3_Tasks.java b/src/tse/lr3/LR_3_Tasks.java index 33abab5..96739b5 100644 --- a/src/tse/lr3/LR_3_Tasks.java +++ b/src/tse/lr3/LR_3_Tasks.java @@ -13,6 +13,7 @@ import java.io.ObjectOutputStream; import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.List; +import tse.Util; /** * @@ -79,7 +80,7 @@ public class LR_3_Tasks { printList(ellipses); System.out.println("Готово"); } catch (IOException ex) { - ex.printStackTrace(); + Util.handleException(ex); } } @@ -106,7 +107,7 @@ public class LR_3_Tasks { oos.close(); fos.close(); } catch (IOException ex) { - ex.printStackTrace(); + Util.handleException(ex); } } @@ -119,7 +120,7 @@ public class LR_3_Tasks { ois.close(); fis.close(); } catch (IOException | ClassNotFoundException ex) { - ex.printStackTrace(); + Util.handleException(ex); } return object; } diff --git a/src/tse/lr4/AccountManager.java b/src/tse/lr4/AccountManager.java index be0e507..e4f2702 100644 --- a/src/tse/lr4/AccountManager.java +++ b/src/tse/lr4/AccountManager.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.ArrayList; +import tse.Util; /** * Менеджер аккаунтов. @@ -67,7 +68,7 @@ public class AccountManager { oos.close(); fos.close(); } catch (IOException ex) { - ex.printStackTrace(); + Util.handleException(ex); } } @@ -80,7 +81,7 @@ public class AccountManager { ois.close(); fis.close(); } catch (IOException | ClassNotFoundException ex) { - ex.printStackTrace(); + Util.handleException(ex); } return object; } diff --git a/src/tse/lr4/NotePadManager.java b/src/tse/lr4/NotePadManager.java index fc7a0de..a295ed3 100644 --- a/src/tse/lr4/NotePadManager.java +++ b/src/tse/lr4/NotePadManager.java @@ -11,6 +11,7 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.Date; import java.util.List; +import tse.Util; /** * Менеджер записей ежедневника. @@ -79,7 +80,7 @@ public class NotePadManager { writer.flush(); writer.close(); } catch (IOException ex) { - ex.printStackTrace(); + Util.handleException(ex); } } @@ -103,7 +104,7 @@ public class NotePadManager { reader.close(); return list; } catch (IOException ex) { - ex.printStackTrace(); + Util.handleException(ex); } return null; } diff --git a/src/tse/lr5/CsvReader.java b/src/tse/lr5/CsvReader.java index 95a8db0..d74a50b 100644 --- a/src/tse/lr5/CsvReader.java +++ b/src/tse/lr5/CsvReader.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; +import tse.Util; /** * Чтение CSV файла. @@ -63,7 +64,7 @@ public class CsvReader { obj = (T) handler.createObject(params); } } catch (RuntimeException ex) { - ex.printStackTrace(); + Util.handleException(ex); } if (obj != null) list.add(obj); } @@ -71,6 +72,4 @@ public class CsvReader { handler.onFinishRead(file); return list; } - - } diff --git a/src/tse/lr5/TrianglesWindow.java b/src/tse/lr5/TrianglesWindow.java index e17948e..96bdf14 100644 --- a/src/tse/lr5/TrianglesWindow.java +++ b/src/tse/lr5/TrianglesWindow.java @@ -66,7 +66,7 @@ public class TrianglesWindow extends JFrame { try { csvReader.readCsv(); } catch (IOException ex) { - ex.printStackTrace(); + Util.handleException(ex); } }