Использование CsvReader в ЛР4

src/tse/lr4/NotePad.java

@@ -60,14 +60,17 @@ public class NotePad {
         return getName() + ". " + getDescription();
     }
     
-    public static NotePad readFromCsvLine(String line) throws ParseException {
+    public static NotePad readFromCsvLine(String[] params) {
-        if (line.isEmpty()) throw new RuntimeException("Пустая строка");
-        String[] params = line.split("\t");
         if (params.length != 4) throw new RuntimeException("Неверное количество параметров");
 
         String name = params[0];
         String description = params[1];
-        Date data = new SimpleDateFormat(DATE_PATTERN).parse(params[2]);
+        Date data;
+        try {
+            data = new SimpleDateFormat(DATE_PATTERN).parse(params[2]);
+        } catch (ParseException ex) {
+            data = new Date(System.currentTimeMillis());
+        }
         boolean important = Boolean.parseBoolean(params[3]);
         
         return new NotePad(name, description, data, important);

src/tse/lr4/NotePadManager.java

@@ -1,13 +1,11 @@
 package tse.lr4;
 
-import java.io.BufferedReader;
+import com.annimon.io.CsvReader;
 import java.io.BufferedWriter;
-import java.io.FileInputStream;
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -30,14 +28,14 @@ public class NotePadManager {
         return instance;
     }
 
-    private ArrayList<NotePad> notepads;
+    private List<NotePad> notepads;
     
     public NotePadManager() {
-        notepads = (ArrayList<NotePad>) readFromCSV(FILENAME);
+        notepads = readFromCSV(FILENAME);
         if (notepads == null) notepads = new ArrayList<>();
     }
     
-    public ArrayList<NotePad> getNotepads() {
+    public List<NotePad> getNotepads() {
         return notepads;
     }
     
@@ -67,7 +65,7 @@ public class NotePadManager {
         createNewEntry(name, desc, date, important);
     }
     
-    private void saveToCSV(String filename, ArrayList<NotePad> list) {
+    private void saveToCSV(String filename, List<NotePad> list) {
         try {
             BufferedWriter writer = new BufferedWriter(
                     new OutputStreamWriter(new FileOutputStream(filename), "UTF-8")
@@ -84,25 +82,23 @@ public class NotePadManager {
         }
     }
     
-    private Object readFromCSV(String filename) {
+    private List<NotePad> readFromCSV(String filename) {
-        try {
+        CsvReader<NotePad> csvReader = new CsvReader<>(new File(filename));
-            List<NotePad> list = new ArrayList<>();
+        csvReader.setReaderHandler(new CsvReader.ReaderHandler<NotePad>() {
-            BufferedReader reader = new BufferedReader(
+
-                new InputStreamReader( new FileInputStream(filename), "UTF-8" )
+            @Override
-            );
+            public void onStartRead(File file) { }
-            reader.readLine(); // Имя,Описание,Дата,Важное
+
-            String line;
+            @Override
-            while ( (line = reader.readLine()) != null ) {
+            public NotePad createObject(String[] params) {
-                NotePad pad = null;
+                return NotePad.readFromCsvLine(params);
-                try {
-                    pad = NotePad.readFromCsvLine(line);
-                } catch (RuntimeException | ParseException ex) {
-                    System.out.println(ex.toString());
-                }
-                if (pad != null) list.add(pad);
             }
-            reader.close();
+
-            return list;
+            @Override
+            public void onFinishRead(File file) { }
+        });
+        try {
+            return csvReader.readCsvToList();
         } catch (IOException ex) {
             Util.handleException(ex);
         }

src/tse/lr4/PadPanel.java

@@ -3,9 +3,9 @@ package tse.lr4;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import javax.swing.GroupLayout;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -199,7 +199,7 @@ public class PadPanel extends JPanel {
         return NotePadManager.getInstance().getNotepads().get(padIndex);
     }
     
-    private ArrayList<NotePad> getNotepads() {
+    private List<NotePad> getNotepads() {
         return NotePadManager.getInstance().getNotepads();
     }