diff --git a/app/src/main/java/ru/project/datasource/ManualDataSource.java b/app/src/main/java/ru/project/datasource/ManualDataSource.java index a6ae64c..a5bdad7 100644 --- a/app/src/main/java/ru/project/datasource/ManualDataSource.java +++ b/app/src/main/java/ru/project/datasource/ManualDataSource.java @@ -23,7 +23,7 @@ public class ManualDataSource implements DataSource{ } @Override public MyList create() { - MyList result = new MyLinkedList<>(); + /*MyList result = new MyLinkedList<>(); String strToParse; Student student; Scanner scanner = new Scanner(System.in); @@ -39,7 +39,7 @@ public class ManualDataSource implements DataSource{ result.add(student); } } - scanner.close(); + scanner.close();*/ return null; } } diff --git a/app/src/main/java/ru/project/datasource/StudentCsvReader.java b/app/src/main/java/ru/project/datasource/StudentCsvReader.java index 7403caa..7e39bee 100644 --- a/app/src/main/java/ru/project/datasource/StudentCsvReader.java +++ b/app/src/main/java/ru/project/datasource/StudentCsvReader.java @@ -62,10 +62,11 @@ public class StudentCsvReader implements Iterator { } double averageGrade = Double.parseDouble(record.get(AVERAGE_GRADE)); + int recordBookNumber = Integer.parseInt(record.get(RECORD_BOOK_NUMBER)); return new StudentBuilder() .setGroupNumber(record.get(GROUP_NUMBER)) .setAverageGrade(averageGrade) - .setRecordBookNumber(record.get(RECORD_BOOK_NUMBER)) + .setRecordBookNumber(recordBookNumber) .build(); }