From aa8a712601ae890134ed41604119d71a66a2ad0b Mon Sep 17 00:00:00 2001 From: nxmarie Date: Sun, 29 Aug 2021 23:32:30 +0100 Subject: [PATCH 1/4] commit on main --- java/src/main/java/com/google/Run.java | 1 + java/src/main/java/com/google/VideoLibrary.java | 1 + 2 files changed, 2 insertions(+) diff --git a/java/src/main/java/com/google/Run.java b/java/src/main/java/com/google/Run.java index 70e56c34..331aba8c 100644 --- a/java/src/main/java/com/google/Run.java +++ b/java/src/main/java/com/google/Run.java @@ -19,6 +19,7 @@ public static void main(String[] args){ return; } parser.executeCommand(Arrays.asList(input.split("\\s+"))); + scanner.close(); } } } diff --git a/java/src/main/java/com/google/VideoLibrary.java b/java/src/main/java/com/google/VideoLibrary.java index c0f3d6b3..2d3f1d06 100644 --- a/java/src/main/java/com/google/VideoLibrary.java +++ b/java/src/main/java/com/google/VideoLibrary.java @@ -36,6 +36,7 @@ class VideoLibrary { } this.videos.put(id, new Video(title, id, tags)); } + scanner.close(); } catch (FileNotFoundException e) { System.out.println("Couldn't find videos.txt"); e.printStackTrace(); From 7e3393660af7b3d8e1b711d30a71bdf05f741b4f Mon Sep 17 00:00:00 2001 From: nxmarie Date: Mon, 22 Nov 2021 21:38:52 +0000 Subject: [PATCH 2/4] commidded --- java/src/main/java/com/google/VideoPlaylist.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java/src/main/java/com/google/VideoPlaylist.java b/java/src/main/java/com/google/VideoPlaylist.java index 2b5d65a0..cb503409 100644 --- a/java/src/main/java/com/google/VideoPlaylist.java +++ b/java/src/main/java/com/google/VideoPlaylist.java @@ -2,5 +2,10 @@ /** A class used to represent a Playlist */ class VideoPlaylist { + //you want the names of the videos in here + //and the playlist name sha + + //name=....get name,, add to list + //show videos, display list of videos } From fc1210133f13da2e0db7df8941e666058a420b1e Mon Sep 17 00:00:00 2001 From: nxmarie Date: Mon, 22 Nov 2021 21:40:20 +0000 Subject: [PATCH 3/4] commit --- .../src/main/java/com/google/SortByTitle.java | 12 ++ java/src/main/java/com/google/Video.java | 2 + .../main/java/com/google/VideoLibrary.java | 45 +++++- .../main/java/com/google/VideoLibrary1.java | 64 +++++++++ .../src/main/java/com/google/VideoPlayer.java | 129 ++++++++++++++++-- java/src/test/java/com/google/Part1Test.java | 3 +- .../java/com/google/VideoLibraryTest.java | 4 +- 7 files changed, 239 insertions(+), 20 deletions(-) create mode 100644 java/src/main/java/com/google/SortByTitle.java create mode 100644 java/src/main/java/com/google/VideoLibrary1.java diff --git a/java/src/main/java/com/google/SortByTitle.java b/java/src/main/java/com/google/SortByTitle.java new file mode 100644 index 00000000..f7f6d618 --- /dev/null +++ b/java/src/main/java/com/google/SortByTitle.java @@ -0,0 +1,12 @@ +package com.google; + +import java.util.Comparator; + +// This class can be used by a Collection of Videos like a List of Videos. By using this, +// I can sort a list of Videos by their title easily whenever we need to display videos in a sorted way. +public class SortByTitle implements Comparator